Merge branch 'akpm' (patches from Andrew)

b66484cd · Linus Torvalds <[email protected]> · 2016-10-07 21:38:00 -07:00

Merge updates from Andrew Morton:

 - fsnotify updates

 - ocfs2 updates

 - all of MM

* emailed patches from Andrew Morton <[email protected]>: (127 commits)
  console: don't prefer first registered if DT specifies stdout-path
  cred: simpler, 1D supplementary groups
  CREDITS: update Pavel's information, add GPG key, remove snail mail address
  mailmap: add Johan Hovold
  .gitattributes: set git diff driver for C source code files
  uprobes: remove function declarations from arch/{mips,s390}
  spelling.txt: "modeled" is spelt correctly
  nmi_backtrace: generate one-line reports for idle cpus
  arch/tile: adopt the new nmi_backtrace framework
  nmi_backtrace: do a local dump_stack() instead of a self-NMI
  nmi_backtrace: add more trigger_*_cpu_backtrace() methods
  min/max: remove sparse warnings when they're nested
  Documentation/filesystems/proc.txt: add more description for maps/smaps
  mm, proc: fix region lost in /proc/self/smaps
  proc: fix timerslack_ns CAP_SYS_NICE check when adjusting self
  proc: add LSM hook checks to /proc/<tid>/timerslack_ns
  proc: relax /proc/<tid>/timerslack_ns capability requirements
  meminfo: break apart a very long seq_printf with #ifdefs
  seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char
  proc: faster /proc/*/status
  ...

Commit: b66484cd74706fa8681d051840fe4b18a3da40ff
Parents: c913fc41 · 05fd007e

Merge commit. Changes below are compared with the first parent: c913fc41.

Changes

195 files changed · +2522 −1698

File	Status	Add	Del	Content
.gitattributes	added	+2	−0	View file
.mailmap	modified	+2	−0	View file
CREDITS	modified	+4	−4	View file
Documentation/filesystems/proc.txt	modified	+12	−0	View file
arch/alpha/Kconfig	modified	+0	−1	View file
arch/alpha/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/arc/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/arm/Kconfig	modified	+0	−1	View file
arch/arm/include/asm/irq.h	modified	+3	−2	View file
arch/arm/kernel/smp.c	modified	+2	−11	View file
arch/arm/kernel/vmlinux-xip.lds.S	modified	+1	−0	View file
arch/arm/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/arm64/Kconfig	modified	+1	−1	View file
arch/arm64/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/avr32/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/blackfin/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/c6x/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/cris/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/frv/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/h8300/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/hexagon/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/ia64/include/asm/atomic.h	modified	+16	−0	View file
arch/ia64/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/m32r/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/m68k/kernel/vmlinux-nommu.lds	modified	+1	−0	View file
arch/m68k/kernel/vmlinux-std.lds	modified	+1	−0	View file
arch/m68k/kernel/vmlinux-sun3.lds	modified	+1	−0	View file
arch/metag/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/microblaze/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/mips/Kconfig	modified	+0	−1	View file
arch/mips/include/asm/irq.h	modified	+3	−2	View file
arch/mips/include/asm/pgtable.h	modified	+0	−2	View file
arch/mips/include/asm/uprobes.h	modified	+0	−12	View file
arch/mips/kernel/process.c	modified	+9	−2	View file
arch/mips/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/mn10300/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/nios2/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/openrisc/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/parisc/Kconfig	modified	+0	−1	View file
arch/parisc/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/powerpc/Kconfig	modified	+0	−1	View file
arch/powerpc/include/asm/mmzone.h	modified	+3	−0	View file
arch/powerpc/kernel/fadump.c	modified	+5	−0	View file
arch/powerpc/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/s390/Kconfig	modified	+1	−1	View file
arch/s390/include/asm/uprobes.h	modified	+0	−10	View file
arch/s390/kernel/compat_linux.c	modified	+2	−2	View file
arch/s390/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/score/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/sh/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/sparc/Kconfig	modified	+0	−1	View file
arch/sparc/include/asm/irq_64.h	modified	+3	−2	View file
arch/sparc/kernel/process_64.c	modified	+5	−5	View file
arch/sparc/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/tile/Kconfig	modified	+0	−1	View file
arch/tile/include/asm/irq.h	modified	+3	−2	View file
arch/tile/kernel/entry.S	modified	+1	−1	View file
arch/tile/kernel/pmc.c	modified	+0	−3	View file
arch/tile/kernel/process.c	modified	+17	−56	View file
arch/tile/kernel/traps.c	modified	+7	−2	View file
arch/tile/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/um/kernel/dyn.lds.S	modified	+1	−0	View file
arch/um/kernel/uml.lds.S	modified	+1	−0	View file
arch/unicore32/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/x86/Kconfig	modified	+1	−1	View file
arch/x86/include/asm/irq.h	modified	+3	−2	View file
arch/x86/include/asm/irqflags.h	modified	+8	−4	View file
arch/x86/include/asm/pgtable_types.h	modified	+0	−2	View file
arch/x86/kernel/acpi/cstate.c	modified	+1	−1	View file
arch/x86/kernel/apic/hw_nmi.c	modified	+9	−9	View file
arch/x86/kernel/process.c	modified	+2	−2	View file
arch/x86/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/xtensa/kernel/vmlinux.lds.S	modified	+3	−0	View file
drivers/acpi/processor_idle.c	modified	+3	−2	View file
drivers/base/memory.c	modified	+4	−1	View file
drivers/cpuidle/driver.c	modified	+3	−2	View file
drivers/idle/intel_idle.c	modified	+2	−2	View file
drivers/of/base.c	modified	+2	−0	View file
drivers/staging/lustre/lustre/ptlrpc/sec.c	modified	+1	−1	View file
fs/Kconfig	modified	+3	−0	View file
fs/dax.c	modified	+1	−1	View file
fs/ext2/file.c	modified	+1	−0	View file
fs/ext4/file.c	modified	+1	−0	View file
fs/hugetlbfs/inode.c	modified	+5	−7	View file
fs/nfs/internal.h	modified	+3	−3	View file
fs/nfs/pagelist.c	modified	+1	−1	View file
fs/nfs/read.c	modified	+1	−1	View file
fs/nfs/write.c	modified	+2	−2	View file
fs/nfsd/auth.c	modified	+3	−3	View file
fs/nfsd/nfs4state.c	modified	+1	−1	View file
fs/notify/fanotify/fanotify_user.c	modified	+19	−20	View file
fs/notify/group.c	modified	+3	−3	View file
fs/notify/inotify/inotify_user.c	modified	+8	−8	View file
fs/notify/notification.c	modified	+23	−12	View file
fs/ocfs2/cluster/tcp.c	modified	+1	−1	View file
fs/ocfs2/dlm/dlmdomain.c	modified	+1	−1	View file
fs/ocfs2/dlmfs/dlmfs.c	modified	+1	−1	View file
fs/ocfs2/inode.h	modified	+0	−2	View file
fs/ocfs2/super.c	modified	+1	−1	View file
fs/proc/array.c	modified	+92	−97	View file
fs/proc/base.c	modified	+36	−16	View file
fs/proc/meminfo.c	modified	+95	−116	View file
fs/proc/stat.c	modified	+24	−25	View file
fs/proc/task_mmu.c	modified	+6	−4	View file
fs/seq_file.c	modified	+44	−13	View file
fs/xfs/xfs_file.c	modified	+1	−0	View file
include/asm-generic/pgtable.h	modified	+3	−0	View file
include/asm-generic/vmlinux.lds.h	modified	+6	−0	View file
include/linux/bitops.h	modified	+26	−10	View file
include/linux/bootmem.h	modified	+5	−4	View file
include/linux/compaction.h	modified	+30	−10	View file
include/linux/console.h	modified	+6	−0	View file
include/linux/cpu.h	modified	+5	−0	View file
include/linux/cred.h	modified	+1	−10	View file
include/linux/fsnotify_backend.h	modified	+1	−2	View file
include/linux/huge_mm.h	modified	+11	−4	View file
include/linux/hugetlb.h	modified	+4	−4	View file
include/linux/jiffies.h	modified	+4	−0	View file
include/linux/kernel.h	modified	+28	−20	View file
include/linux/memblock.h	modified	+1	−0	View file
include/linux/memcontrol.h	modified	+19	−2	View file
include/linux/mm.h	modified	+20	−24	View file
include/linux/mm_types.h	modified	+0	−2	View file
include/linux/nmi.h	modified	+26	−5	View file
include/linux/oom.h	modified	+8	−38	View file
include/linux/page_ext.h	modified	+2	−6	View file
include/linux/page_owner.h	modified	+2	−0	View file
include/linux/pagemap.h	modified	+13	−1	View file
include/linux/sched.h	modified	+19	−3	View file
include/linux/seq_file.h	modified	+2	−2	View file
include/linux/swap.h	modified	+7	−4	View file
include/linux/writeback.h	modified	+0	−1	View file
include/trace/events/compaction.h	modified	+1	−1	View file
kernel/exit.c	modified	+1	−1	View file
kernel/fork.c	modified	+8	−0	View file
kernel/groups.c	modified	+21	−46	View file
kernel/power/process.c	modified	+3	−14	View file
kernel/printk/printk.c	modified	+12	−1	View file
kernel/sched/idle.c	modified	+11	−2	View file
kernel/uid16.c	modified	+2	−2	View file
lib/Kconfig	modified	+0	−3	View file
lib/atomic64_test.c	modified	+0	−4	View file
lib/nmi_backtrace.c	modified	+29	−13	View file
mm/bootmem.c	modified	+2	−12	View file
mm/compaction.c	modified	+99	−106	View file
mm/debug.c	modified	+5	−0	View file
mm/filemap.c	modified	+7	−1	View file
mm/huge_memory.c	modified	+69	−12	View file
mm/hugetlb.c	modified	+38	−15	View file
mm/internal.h	modified	+2	−1	View file
mm/ksm.c	modified	+6	−1	View file
mm/memblock.c	modified	+5	−0	View file
mm/memcontrol.c	modified	+67	−87	View file
mm/memory.c	modified	+19	−2	View file
mm/memory_hotplug.c	modified	+3	−1	View file
mm/mempolicy.c	modified	+1	−1	View file
mm/migrate.c	modified	+1	−1	View file
mm/mincore.c	modified	+3	−2	View file
mm/mlock.c	modified	+52	−0	View file
mm/mmap.c	modified	+193	−45	View file
mm/mprotect.c	modified	+2	−1	View file
mm/nobootmem.c	modified	+10	−10	View file
mm/oom_kill.c	modified	+183	−198	View file
mm/page-writeback.c	modified	+2	−32	View file
mm/page_alloc.c	modified	+183	−98	View file
mm/page_ext.c	modified	+33	−12	View file
mm/page_io.c	modified	+4	−3	View file
mm/page_isolation.c	modified	+1	−1	View file
mm/page_owner.c	modified	+133	−23	View file
mm/shmem.c	modified	+1	−1	View file
mm/swap.c	modified	+1	−3	View file
mm/swap_state.c	modified	+7	−7	View file
mm/swapfile.c	modified	+65	−72	View file
mm/vmacache.c	modified	+4	−4	View file
mm/vmalloc.c	modified	+10	−12	View file
mm/vmscan.c	modified	+24	−29	View file
mm/vmstat.c	modified	+15	−80	View file
net/core/sock.c	modified	+3	−3	View file
net/ipv4/ping.c	modified	+5	−10	View file
net/ipv4/tcp.c	modified	+0	−2	View file
net/ipv4/tcp_ipv4.c	modified	+0	−3	View file
net/sunrpc/auth_generic.c	modified	+2	−2	View file
net/sunrpc/auth_gss/gss_rpc_xdr.c	modified	+1	−1	View file
net/sunrpc/auth_gss/svcauth_gss.c	modified	+1	−1	View file
net/sunrpc/auth_unix.c	modified	+2	−2	View file
net/sunrpc/svcauth_unix.c	modified	+3	−3	View file
scripts/mod/modpost.c	modified	+1	−1	View file
scripts/recordmcount.c	modified	+1	−0	View file
scripts/recordmcount.pl	modified	+1	−0	View file
scripts/spelling.txt	modified	+0	−1	View file
tools/testing/selftests/vm/.gitignore	modified	+1	−0	View file
tools/testing/selftests/vm/Makefile	modified	+4	−0	View file
tools/testing/selftests/vm/mlock-random-test.c	added	+293	−0	View file
tools/testing/selftests/vm/mlock2-tests.c	modified	+1	−62	View file
tools/testing/selftests/vm/mlock2.h	added	+62	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

.gitattributes

View file

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..89c411b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.c   diff=cpp
+*.h   diff=cpp

.mailmap

View file

diff --git a/.mailmap b/.mailmap
index 967f882..2408e56 100644
--- a/.mailmap
+++ b/.mailmap
@@ -75,6 +75,8 @@ Jean Tourrilhes <[email protected]>
 Jeff Garzik <[email protected]>
 Jens Axboe <[email protected]>
 Jens Osterkamp <[email protected]>
+Johan Hovold <[email protected]> <[email protected]>
+Johan Hovold <[email protected]> <[email protected]>
 John Paul Adrian Glaubitz <[email protected]>
 John Stultz <[email protected]>
 <[email protected]> <[email protected]>

CREDITS

View file

diff --git a/CREDITS b/CREDITS
index df0a50e..513aaa3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2296,11 +2296,11 @@ D: Initial implementation of VC's, pty's and select()
 
 N: Pavel Machek
 E: [email protected]
-D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
+P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96
+D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
 D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
-D: work on suspend-to-ram/disk, killing duplicates from ioctl32
-S: Volkova 1131
-S: 198 00 Praha 9
+D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
+D: Altera SoCFPGA and Nokia N900 support.
 S: Czech Republic
 
 N: Paul Mackerras

Documentation/filesystems/proc.txt

View file

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index fcc1ac0..219ffd4 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -515,6 +515,18 @@ be vanished or the reverse -- new added.
 This file is only present if the CONFIG_MMU kernel configuration option is
 enabled.
 
+Note: reading /proc/PID/maps or /proc/PID/smaps is inherently racy (consistent
+output can be achieved only in the single read call).
+This typically manifests when doing partial reads of these files while the
+memory map is being modified.  Despite the races, we do provide the following
+guarantees:
+
+1) The mapped addresses never go backwards, which implies no two
+   regions will ever overlap.
+2) If there is something at a given vaddr during the entirety of the
+   life of the smaps/maps walk, there will be some output for it.
+
+
 The /proc/PID/clear_refs is used to reset the PG_Referenced and ACCESSED/YOUNG
 bits on both physical and virtual pages associated with a process, and the
 soft-dirty bit on pte (see Documentation/vm/soft-dirty.txt for details).

arch/alpha/Kconfig

View file

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 7f312d8..0e49d39 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -15,7 +15,6 @@ config ALPHA
 	select GENERIC_IRQ_SHOW
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select AUDIT_ARCH
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_SMP_IDLE_THREAD

arch/alpha/kernel/vmlinux.lds.S

View file

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 647b84c..cebecfb 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -22,6 +22,7 @@ SECTIONS
 		HEAD_TEXT
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		*(.fixup)
 		*(.gnu.warning)

arch/arc/kernel/vmlinux.lds.S

View file

diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 3661107..f35ed57 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -89,6 +89,7 @@ SECTIONS
 		_text = .;
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		*(.fixup)

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 125657b..b5d529f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2,7 +2,6 @@ config ARM
 	bool
 	default y
 	select ARCH_CLOCKSOURCE_DATA
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 	select ARCH_HAS_ELF_RANDOMIZE
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

arch/arm/include/asm/irq.h

View file

diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index 1bd9510..e53638c 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -36,8 +36,9 @@ extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
 #endif
 
 #ifdef CONFIG_SMP
-extern void arch_trigger_all_cpu_backtrace(bool);
-#define arch_trigger_all_cpu_backtrace(x) arch_trigger_all_cpu_backtrace(x)
+extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,
+					   bool exclude_self);
+#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace
 #endif
 
 static inline int nr_legacy_irqs(void)

arch/arm/kernel/smp.c

View file

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 937c892..7dd14e8 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -748,19 +748,10 @@ core_initcall(register_cpufreq_notifier);
 
 static void raise_nmi(cpumask_t *mask)
 {
-	/*
-	 * Generate the backtrace directly if we are running in a calling
-	 * context that is not preemptible by the backtrace IPI. Note
-	 * that nmi_cpu_backtrace() automatically removes the current cpu
-	 * from mask.
-	 */
-	if (cpumask_test_cpu(smp_processor_id(), mask) && irqs_disabled())
-		nmi_cpu_backtrace(NULL);
-
 	smp_cross_call(mask, IPI_CPU_BACKTRACE);
 }
 
-void arch_trigger_all_cpu_backtrace(bool include_self)
+void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
 {
-	nmi_trigger_all_cpu_backtrace(include_self, raise_nmi);
+	nmi_trigger_cpumask_backtrace(mask, exclude_self, raise_nmi);
 }

arch/arm/kernel/vmlinux-xip.lds.S

View file

diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index cba1ec8..7fa487e 100644
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -98,6 +98,7 @@ SECTIONS
 			IRQENTRY_TEXT
 			TEXT_TEXT
 			SCHED_TEXT
+			CPUIDLE_TEXT
 			LOCK_TEXT
 			KPROBES_TEXT
 			*(.gnu.warning)

arch/arm/kernel/vmlinux.lds.S

View file

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index d24e5dd..f7f55df 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -111,6 +111,7 @@ SECTIONS
 			SOFTIRQENTRY_TEXT
 			TEXT_TEXT
 			SCHED_TEXT
+			CPUIDLE_TEXT
 			LOCK_TEXT
 			HYPERVISOR_TEXT
 			KPROBES_TEXT

arch/arm64/Kconfig

View file

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 0160040..30398db 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -8,9 +8,9 @@ config ARM64
 	select ARCH_CLOCKSOURCE_DATA
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select ARCH_HAS_ELF_RANDOMIZE
 	select ARCH_HAS_GCOV_PROFILE_ALL
+	select ARCH_HAS_GIGANTIC_PAGE
 	select ARCH_HAS_KCOV
 	select ARCH_HAS_SG_CHAIN
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

arch/arm64/kernel/vmlinux.lds.S

View file

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 5ce9b29..1105aab 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -122,6 +122,7 @@ SECTIONS
 			ENTRY_TEXT
 			TEXT_TEXT
 			SCHED_TEXT
+			CPUIDLE_TEXT
 			LOCK_TEXT
 			KPROBES_TEXT
 			HYPERVISOR_TEXT

arch/avr32/kernel/vmlinux.lds.S

View file

diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index a458917..17f2730 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -52,6 +52,7 @@ SECTIONS
 		KPROBES_TEXT
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		*(.fixup)
 		*(.gnu.warning)

arch/blackfin/kernel/vmlinux.lds.S

View file

diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index d920b95..68069a1 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -33,6 +33,7 @@ SECTIONS
 #ifndef CONFIG_SCHEDULE_L1
 		SCHED_TEXT
 #endif
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		IRQENTRY_TEXT
 		SOFTIRQENTRY_TEXT

arch/c6x/kernel/vmlinux.lds.S

View file

diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S
index 50bc10f..a1a5c16 100644
--- a/arch/c6x/kernel/vmlinux.lds.S
+++ b/arch/c6x/kernel/vmlinux.lds.S
@@ -70,6 +70,7 @@ SECTIONS
 		_stext = .;
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		IRQENTRY_TEXT
 		SOFTIRQENTRY_TEXT

arch/cris/kernel/vmlinux.lds.S

View file

diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
index 7552c25..9795862 100644
--- a/arch/cris/kernel/vmlinux.lds.S
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -43,6 +43,7 @@ SECTIONS
 		HEAD_TEXT
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		*(.fixup)
 		*(.text.__*)

arch/frv/kernel/vmlinux.lds.S

View file

diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index 7e958d8..aa6e573 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -63,6 +63,7 @@ SECTIONS
 	*(.text..tlbmiss)
 	TEXT_TEXT
 	SCHED_TEXT
+	CPUIDLE_TEXT
 	LOCK_TEXT
 #ifdef CONFIG_DEBUG_INFO
 	INIT_TEXT

arch/h8300/kernel/vmlinux.lds.S

View file

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index cb5dfb0..7f11da1 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -29,6 +29,7 @@ SECTIONS
 	_stext = . ;
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 #if defined(CONFIG_ROMKERNEL)
 		*(.int_redirect)

arch/hexagon/kernel/vmlinux.lds.S

View file

diff --git a/arch/hexagon/kernel/vmlinux.lds.S b/arch/hexagon/kernel/vmlinux.lds.S
index 5f268c1..ec87e67 100644
--- a/arch/hexagon/kernel/vmlinux.lds.S
+++ b/arch/hexagon/kernel/vmlinux.lds.S
@@ -50,6 +50,7 @@ SECTIONS
 		_text = .;
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		*(.fixup)

arch/ia64/include/asm/atomic.h

View file

diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index f565ad3..65d4bb2 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -269,6 +269,22 @@ static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)
 
 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
 
+static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
+{
+	long c, old, dec;
+	c = atomic64_read(v);
+	for (;;) {
+		dec = c - 1;
+		if (unlikely(dec < 0))
+			break;
+		old = atomic64_cmpxchg((v), c, dec);
+		if (likely(old == c))
+			break;
+		c = old;
+	}
+	return dec;
+}
+
 /*
  * Atomically add I to V and return TRUE if the resulting value is
  * negative.

arch/ia64/kernel/vmlinux.lds.S

View file

diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index dc506b0..f89d20c 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -46,6 +46,7 @@ SECTIONS {
 		__end_ivt_text = .;
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		*(.gnu.linkonce.t*)

arch/m32r/kernel/vmlinux.lds.S

View file

diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 018e4a7..ad1fe56 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -31,6 +31,7 @@ SECTIONS
 	HEAD_TEXT
 	TEXT_TEXT
 	SCHED_TEXT
+	CPUIDLE_TEXT
 	LOCK_TEXT
 	*(.fixup)
 	*(.gnu.warning)

arch/m68k/kernel/vmlinux-nommu.lds

View file

diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds
index 06a763f..d2c8abf 100644
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@@ -45,6 +45,7 @@ SECTIONS {
 		HEAD_TEXT
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		*(.fixup)
 		. = ALIGN(16);

arch/m68k/kernel/vmlinux-std.lds

View file

diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index d099359..5b5ce1e 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -16,6 +16,7 @@ SECTIONS
 	HEAD_TEXT
 	TEXT_TEXT
 	SCHED_TEXT
+	CPUIDLE_TEXT
 	LOCK_TEXT
 	*(.fixup)
 	*(.gnu.warning)

arch/m68k/kernel/vmlinux-sun3.lds

View file

diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 8080469..fe5ea19 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -16,6 +16,7 @@ SECTIONS
 	HEAD_TEXT
 	TEXT_TEXT
 	SCHED_TEXT
+	CPUIDLE_TEXT
 	LOCK_TEXT
 	*(.fixup)
 	*(.gnu.warning)

arch/metag/kernel/vmlinux.lds.S

View file

diff --git a/arch/metag/kernel/vmlinux.lds.S b/arch/metag/kernel/vmlinux.lds.S
index 150ace9..e6c700e 100644
--- a/arch/metag/kernel/vmlinux.lds.S
+++ b/arch/metag/kernel/vmlinux.lds.S
@@ -21,6 +21,7 @@ SECTIONS
   .text : {
 	TEXT_TEXT
 	SCHED_TEXT
+	CPUIDLE_TEXT
 	LOCK_TEXT
 	KPROBES_TEXT
 	IRQENTRY_TEXT

arch/microblaze/kernel/vmlinux.lds.S

View file

diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
index 0a47f04..289d0e7 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -33,6 +33,7 @@ SECTIONS {
 		EXIT_TEXT
 		EXIT_CALL
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		IRQENTRY_TEXT

arch/mips/Kconfig

View file

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 212ff92..1a322c8 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -30,7 +30,6 @@ config MIPS
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
 	select RTC_LIB if !MACH_LOONGSON64
 	select GENERIC_ATOMIC64 if !64BIT
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select HAVE_DMA_CONTIGUOUS
 	select HAVE_DMA_API_DEBUG
 	select GENERIC_IRQ_PROBE

arch/mips/include/asm/irq.h

View file

diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index 15e0fec..6bf10e7 100644
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -51,7 +51,8 @@ extern int cp0_fdc_irq;
 
 extern int get_c0_fdc_int(void);
 
-void arch_trigger_all_cpu_backtrace(bool);
-#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
+void arch_trigger_cpumask_backtrace(const struct cpumask *mask,
+				    bool exclude_self);
+#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace
 
 #endif /* _ASM_IRQ_H */

arch/mips/include/asm/pgtable.h

View file

diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index 70128d3..9e9e944 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -673,8 +673,6 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
 struct file;
 pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
 		unsigned long size, pgprot_t vma_prot);
-int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
-		unsigned long size, pgprot_t *vma_prot);
 #endif
 
 /*

arch/mips/include/asm/uprobes.h

View file

diff --git a/arch/mips/include/asm/uprobes.h b/arch/mips/include/asm/uprobes.h
index 70a4a2f..b86d1ae 100644
--- a/arch/mips/include/asm/uprobes.h
+++ b/arch/mips/include/asm/uprobes.h
@@ -42,16 +42,4 @@ struct arch_uprobe_task {
 	unsigned long saved_trap_nr;
 };
 
-extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup,
-	struct mm_struct *mm, unsigned long addr);
-extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);
-extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
-extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
-extern int arch_uprobe_exception_notify(struct notifier_block *self,
-	unsigned long val, void *data);
-extern void arch_uprobe_abort_xol(struct arch_uprobe *aup,
-	struct pt_regs *regs);
-extern unsigned long arch_uretprobe_hijack_return_addr(
-	unsigned long trampoline_vaddr, struct pt_regs *regs);
-
 #endif /* __ASM_UPROBES_H */

arch/mips/kernel/process.c

View file

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index d2d0615..9514e5f 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -569,9 +569,16 @@ static void arch_dump_stack(void *info)
 	dump_stack();
 }
 
-void arch_trigger_all_cpu_backtrace(bool include_self)
+void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
 {
-	smp_call_function(arch_dump_stack, NULL, 1);
+	long this_cpu = get_cpu();
+
+	if (cpumask_test_cpu(this_cpu, mask) && !exclude_self)
+		dump_stack();
+
+	smp_call_function_many(mask, arch_dump_stack, NULL, 1);
+
+	put_cpu();
 }
 
 int mips_get_process_fp_mode(struct task_struct *task)

arch/mips/kernel/vmlinux.lds.S

View file

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index a82c178..d5de675 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -55,6 +55,7 @@ SECTIONS
 	.text : {
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		IRQENTRY_TEXT

arch/mn10300/kernel/vmlinux.lds.S

View file

diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index 13c4814..2d5f1c3 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -30,6 +30,7 @@ SECTIONS
 	HEAD_TEXT
 	TEXT_TEXT
 	SCHED_TEXT
+	CPUIDLE_TEXT
 	LOCK_TEXT
 	KPROBES_TEXT
 	*(.fixup)

arch/nios2/kernel/vmlinux.lds.S

View file

diff --git a/arch/nios2/kernel/vmlinux.lds.S b/arch/nios2/kernel/vmlinux.lds.S
index e23e895..6a8045b 100644
--- a/arch/nios2/kernel/vmlinux.lds.S
+++ b/arch/nios2/kernel/vmlinux.lds.S
@@ -37,6 +37,7 @@ SECTIONS
 	.text : {
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		IRQENTRY_TEXT
 		SOFTIRQENTRY_TEXT

arch/openrisc/kernel/vmlinux.lds.S

View file

diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index d936de4..d68b9ed 100644
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@@ -47,6 +47,7 @@ SECTIONS
           _stext = .;
 	  TEXT_TEXT
 	  SCHED_TEXT
+	  CPUIDLE_TEXT
 	  LOCK_TEXT
 	  KPROBES_TEXT
 	  IRQENTRY_TEXT

arch/parisc/Kconfig

View file

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 2a0339a..71c4a3a 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -16,7 +16,6 @@ config PARISC
 	select BUILDTIME_EXTABLE_SORT
 	select HAVE_PERF_EVENTS
 	select GENERIC_ATOMIC64 if !64BIT
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select GENERIC_IRQ_PROBE
 	select GENERIC_PCI_IOMAP
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG

arch/parisc/kernel/vmlinux.lds.S

View file

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 5b8fae8..b37787d 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -69,6 +69,7 @@ SECTIONS
 	.text ALIGN(PAGE_SIZE) : {
 		TEXT_TEXT
 		SCHED_TEXT
+		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		IRQENTRY_TEXT

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 569b4f9..65fba4c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -108,7 +108,6 @@ config PPC
 	select HAVE_DEBUG_KMEMLEAK
 	select ARCH_HAS_SG_CHAIN
 	select GENERIC_ATOMIC64 if PPC32
-	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select HAVE_PERF_EVENTS
 	select HAVE_PERF_REGS
 	select HAVE_PERF_USER_STACK_DUMP

arch/powerpc/include/asm/mmzone.h

View file

diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h
index 7b58917..4d52ccf 100644
--- a/arch/powerpc/include/asm/mmzone.h
+++ b/arch/powerpc/include/asm/mmzone.h
@@ -41,6 +41,9 @@ u64 memory_hotplug_max(void);
 #else
 #define memory_hotplug_max() memblock_end_of_DRAM()
 #endif /* CONFIG_NEED_MULTIPLE_NODES */
+#ifdef CONFIG_FA_DUMP
+#define __HAVE_ARCH_RESERVED_KERNEL_PAGES
+#endif
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_MMZONE_H_ */

arch/powerpc/kernel/fadump.c

View file

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 963918e..8f0c7c5 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -333,6 +333,11 @@ int __init fadump_reserve_mem(void)
 	return 1;
 }
 
+unsigned long __init arch_reserved_kernel_pages(void)
+{
+	return memblock_reserved_size() / PAGE_SIZE;
+}
+
 /* Look for fadump= cmdline option. */
 static int __init early_fadump_param(char *p)
 {