diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/blackfin/include/asm/pgtable.h | |
parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/blackfin/include/asm/pgtable.h')
-rw-r--r-- | arch/blackfin/include/asm/pgtable.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/pgtable.h b/arch/blackfin/include/asm/pgtable.h index 783c8f7f8f8c..821c699c2238 100644 --- a/arch/blackfin/include/asm/pgtable.h +++ b/arch/blackfin/include/asm/pgtable.h | |||
@@ -1,3 +1,9 @@ | |||
1 | /* | ||
2 | * Copyright 2004-2009 Analog Devices Inc. | ||
3 | * | ||
4 | * Licensed under the GPL-2 or later. | ||
5 | */ | ||
6 | |||
1 | #ifndef _BLACKFIN_PGTABLE_H | 7 | #ifndef _BLACKFIN_PGTABLE_H |
2 | #define _BLACKFIN_PGTABLE_H | 8 | #define _BLACKFIN_PGTABLE_H |
3 | 9 | ||
@@ -92,6 +98,12 @@ extern unsigned int kobjsize(const void *objp); | |||
92 | #define VMALLOC_START 0 | 98 | #define VMALLOC_START 0 |
93 | #define VMALLOC_END 0xffffffff | 99 | #define VMALLOC_END 0xffffffff |
94 | 100 | ||
101 | /* provide a special get_unmapped_area for framebuffer mmaps of nommu */ | ||
102 | extern unsigned long get_fb_unmapped_area(struct file *filp, unsigned long, | ||
103 | unsigned long, unsigned long, | ||
104 | unsigned long); | ||
105 | #define HAVE_ARCH_FB_UNMAPPED_AREA | ||
106 | |||
95 | #include <asm-generic/pgtable.h> | 107 | #include <asm-generic/pgtable.h> |
96 | 108 | ||
97 | #endif /* _BLACKFIN_PGTABLE_H */ | 109 | #endif /* _BLACKFIN_PGTABLE_H */ |