Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic (27ebbf9d) · Commits · 戴 / test

Pull nommu generic uaccess updates from Arnd Bergmann: "asm-generic: kill <asm/segment.h> and improve nommu generic uaccess helpers Christoph Hellwig writes: This is a series doing two somewhat interwinded things. It improves the asm-generic nommu uaccess helper to optionally be entirely generic and not require any arch helpers for the actual uaccess. For the generic uaccess.h to actually be generically useful I also had to kill off the mess we made of <asm/segment.h>, which really shouldn't exist on most architectures" * tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: asm-generic: optimize generic uaccess for 8-byte loads and stores asm-generic: provide entirely generic nommu uaccess arch: mostly remove <asm/segment.h> asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>

arch/alpha/include/asm/segment.h

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		#ifndef __ALPHA_SEGMENT_H
		#define __ALPHA_SEGMENT_H

		/* Only here because we have some old header files that expect it.. */

		#endif

arch/alpha/kernel/smc37c669.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@

		#include <asm/hwrpb.h>
		#include <asm/io.h>
		#include <asm/segment.h>

		#if 0
		# define DBG_DEVS(args) printk args

arch/alpha/kernel/smc37c93x.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@

		#include <asm/hwrpb.h>
		#include <asm/io.h>
		#include <asm/segment.h>

		#define SMC_DEBUG 0

arch/arc/include/asm/uaccess.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -742,6 +742,7 @@ extern long arc_strnlen_user_noinline(const char __user *src, long n);

		#endif

		#include <asm/segment.h>
		#include <asm-generic/uaccess.h>

		#endif

arch/arm/include/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ generic-y += msi.h
		generic-y += parport.h
		generic-y += preempt.h
		generic-y += seccomp.h
		generic-y += segment.h
		generic-y += serial.h
		generic-y += simd.h
		generic-y += trace_clock.h

Admin message