diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:59:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:59:10 -0400 |
| commit | 8e3ade251bc7c0a4f0777df4dd34343a03efadba (patch) | |
| tree | 6c0b78731e3d6609057951d07660efbd90992ad0 /arch/microblaze | |
| parent | e317234975cb7463b8ca21a93bb6862d9dcf113f (diff) | |
| parent | e075f59152890ffd7e3d704afc997dd686c8a781 (diff) | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge second batch of patches from Andrew Morton:
- various misc things
- core kernel changes to prctl, exit, exec, init, etc.
- kernel/watchdog.c updates
- get_maintainer
- MAINTAINERS
- the backlight driver queue
- core bitops code cleanups
- the led driver queue
- some core prio_tree work
- checkpatch udpates
- largeish crc32 update
- a new poll() feature for the v4l guys
- the rtc driver queue
- fatfs
- ptrace
- signals
- kmod/usermodehelper updates
- coredump
- procfs updates
* emailed from Andrew Morton <akpm@linux-foundation.org>: (141 commits)
seq_file: add seq_set_overflow(), seq_overflow()
proc-ns: use d_set_d_op() API to set dentry ops in proc_ns_instantiate().
procfs: speed up /proc/pid/stat, statm
procfs: add num_to_str() to speed up /proc/stat
proc: speed up /proc/stat handling
fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP
coredump: remove VM_ALWAYSDUMP flag
kmod: make __request_module() killable
kmod: introduce call_modprobe() helper
usermodehelper: ____call_usermodehelper() doesn't need do_exit()
usermodehelper: kill umh_wait, renumber UMH_* constants
usermodehelper: implement UMH_KILLABLE
usermodehelper: introduce umh_complete(sub_info)
usermodehelper: use UMH_WAIT_PROC consistently
signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/
signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()
signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths
signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE
Hexagon: use set_current_blocked() and block_sigmask()
...
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index b2af42311a12..44dc67aa0277 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h | |||
| @@ -543,8 +543,6 @@ extern unsigned long iopa(unsigned long addr); | |||
| 543 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ | 543 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ |
| 544 | #define kern_addr_valid(addr) (1) | 544 | #define kern_addr_valid(addr) (1) |
| 545 | 545 | ||
| 546 | #define io_remap_page_range remap_page_range | ||
| 547 | |||
| 548 | /* | 546 | /* |
| 549 | * No page table caches to initialise | 547 | * No page table caches to initialise |
| 550 | */ | 548 | */ |