diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2010-10-19 18:35:57 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2010-10-19 18:35:57 -0700 |
| commit | b2a431a08dcd6861b463fb5dce620becd7938839 (patch) | |
| tree | 9a877be6d0dcd7ece5b8e86886227fecfde1de19 /arch/arm/include | |
| parent | 190e9d9e000b582e66663a2374cefa4086e59ca0 (diff) | |
| parent | 15fb3ba5a63ed7d7ee7a34f25699750bc20cd842 (diff) | |
Merge remote branch 'android-tegra-2.6.36'
Conflicts:
arch/arm/configs/tegra_defconfig
arch/arm/mach-tegra/tegra_i2s_audio.c
Change-Id: Ib0d7fc5c84b21a58f78a4a987c245e0e110ff437
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/attrib_alloc.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/arch/arm/include/asm/attrib_alloc.h b/arch/arm/include/asm/attrib_alloc.h deleted file mode 100644 index bd21761810f5..000000000000 --- a/arch/arm/include/asm/attrib_alloc.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * arch/arm/include/asm/attrib_alloc.h - * - * Page allocator with custom cache attributes - * - * Copyright (c) 2010, NVIDIA Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef __ARCH_ARM_ATTRIB_ALLOC_H -#define __ARCH_ARM_ATTRIB_ALLOC_H - -#include <linux/types.h> -#include <asm/page.h> - -struct page *arm_attrib_alloc_pages_exact_node(int nid, gfp_t gfp, - size_t size, pgprot_t prot); - -void arm_attrib_free_pages_exact(struct page *page, size_t size); - -static inline -struct page *arm_attrib_alloc_pages_exact(gfp_t gfp, size_t size, - pgprot_t prot) -{ - return arm_attrib_alloc_pages_exact_node(-1, gfp, size, prot); -} - -#define arm_attrib_alloc_page(gfp, prot) \ - arm_attrib_alloc_pages_exact((gfp), PAGE_SIZE, (prot)) - -#define arm_attrib_free_page(page) \ - arm_attrib_free_pages_exact((page), PAGE_SIZE) - -#endif /* __ARCH_ARM_ATTRIB_ALLOC_H */ |