diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-07 16:39:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-07 16:39:32 +0100 |
| commit | de9ac5cea33098143edd26d10ece7fe215e66623 (patch) | |
| tree | b42efed8d401080acc0ab444999a6a27623c3a77 /arch/microblaze/include/asm/highmem.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | microblaze: Update microblaze defconfigs (diff) | |
| download | linux-de9ac5cea33098143edd26d10ece7fe215e66623.tar.xz linux-de9ac5cea33098143edd26d10ece7fe215e66623.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"This fixes noMMU kernel and I have also added defconfig updates which
fix issue with one external dependency and enable all xilinx device
drivers for 0-day testing system.
Additionally wire up finit_module system call, and do highmem fixup
and pci warnings reported by the 0-day testing system"
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Update microblaze defconfigs
microblaze: Fix pci compilation and sparse warnings
microblaze: Add finit_module syscall
microblaze: Kill __kmap_atomic()
microblaze: Change section flags for noMMU
microblaze: Microblaze wants sys_fork for noMMU too
Diffstat (limited to 'arch/microblaze/include/asm/highmem.h')
| -rw-r--r-- | arch/microblaze/include/asm/highmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/highmem.h b/arch/microblaze/include/asm/highmem.h index 2446a73140ac..d04638932438 100644 --- a/arch/microblaze/include/asm/highmem.h +++ b/arch/microblaze/include/asm/highmem.h @@ -71,7 +71,7 @@ static inline void kunmap(struct page *page) kunmap_high(page); } -static inline void *__kmap_atomic(struct page *page) +static inline void *kmap_atomic(struct page *page) { return kmap_atomic_prot(page, kmap_prot); } |