Merge branch 'akpm' (Andrew's patch-bomb) (00c3e276) · Commits · 戴 / test

Merge random patches from Andrew Morton. * Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (32 commits) memblock: free allocated memblock_reserved_regions later mm: sparse: fix usemap allocation above node descriptor section mm: sparse: fix section usemap placement calculation xtensa: fix incorrect memset shmem: cleanup shmem_add_to_page_cache shmem: fix negative rss in memcg memory.stat tmpfs: revert SEEK_DATA and SEEK_HOLE drivers/rtc/rtc-twl.c: fix threaded IRQ to use IRQF_ONESHOT fat: fix non-atomic NFS i_pos read MAINTAINERS: add OMAP CPUfreq driver to OMAP Power Management section sgi-xp: nested calls to spin_lock_irqsave() fs: ramfs: file-nommu: add SetPageUptodate() drivers/rtc/rtc-mxc.c: fix irq enabled interrupts warning mm/memory_hotplug.c: release memory resources if hotadd_new_pgdat() fails h8300/uaccess: add mising __clear_user() h8300/uaccess: remove assignment to __gu_val in unhandled case of get_user() h8300/time: add missing #include <asm/irq_regs.h> h8300/signal: fix typo "statis" h8300/pgtable: add missing #include <asm-generic/pgtable.h> drivers/rtc/rtc-ab8500.c: ensure correct probing of the AB8500 RTC when Device Tree is enabled ...

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -4857,6 +4857,7 @@ M: Kevin Hilman <khilman@ti.com>
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: arch/arm/omap/pm
		F: drivers/cpufreq/omap-cpufreq.c

		OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
		M: Rajendra Nayak <rnayak@ti.com>

arch/h8300/include/asm/pgtable.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -70,4 +70,7 @@ extern int is_in_rom(unsigned long);
		#define VMALLOC_END 0xffffffff

		#define arch_enter_lazy_cpu_mode() do {} while (0)

		#include <asm-generic/pgtable.h>

		#endif /* _H8300_PGTABLE_H */

arch/h8300/include/asm/uaccess.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,6 @@ extern int __put_user_bad(void);
		break; \
		default: \
		__gu_err = __get_user_bad(); \
		__gu_val = 0; \
		break; \
		} \
		(x) = __gu_val; \
		@@ -159,4 +158,6 @@ clear_user(void *to, unsigned long n)
		return 0;
		}

		#define __clear_user clear_user

		#endif /* _H8300_UACCESS_H */

arch/h8300/kernel/signal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -447,7 +447,7 @@ handle_signal(unsigned long sig, siginfo_t info, struct k_sigaction ka,
		* want to handle. Thus you cannot kill init even with a SIGKILL even by
		* mistake.
		*/
		statis void do_signal(struct pt_regs *regs)
		static void do_signal(struct pt_regs *regs)
		{
		siginfo_t info;
		int signr;

arch/h8300/kernel/time.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <linux/profile.h>

		#include <asm/io.h>
		#include <asm/irq_regs.h>
		#include <asm/timer.h>

		#define TICK_SIZE (tick_nsec / 1000)

Admin message