Sam Ravnborg f92ffa12f4 sparc: Merge asm-sparc{,64}/mman.h ... Renaming the function sparc64_mmap_check() to sparc_mmap_check() was enough to make the two header files identical. :$ diff -u include/asm-sparc/mman.h include/asm-sparc64/mman.h :-- include/asm-sparc/mman.h 2008-06-13 06:46:39.000000000 +0200 :++ include/asm-sparc64/mman.h 2008-06-13 06:46:39.000000000 +0200 :@@ -1,5 +1,5 @@ :-#ifndef __SPARC_MMAN_H__ :-#define __SPARC_MMAN_H__ :+#ifndef __SPARC64_MMAN_H__ :+#define __SPARC64_MMAN_H__ : : #include <asm-generic/mman.h> : :@@ -23,9 +23,9 @@ : : #ifdef __KERNEL__ : #ifndef __ASSEMBLY__ :-#define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len) :-int sparc_mmap_check(unsigned long addr, unsigned long len); :+#define arch_mmap_check(addr,len,flags) sparc64_mmap_check(addr,len) :+int sparc64_mmap_check(unsigned long addr, unsigned long len); : #endif : #endif : :-#endif /* __SPARC_MMAN_H__ */ :+#endif /* __SPARC64_MMAN_H__ */ Signed-off-by: Sam Ravnborg <sam@ravnborg.org>		2008-07-17 21:41:51 -07:00
..
alpha	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
arm	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2008-07-16 15:17:52 -07:00
blackfin	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
cris	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
frv	PCI: remove unused arch pcibios_update_resource() functions	2008-06-27 13:14:01 -07:00
h8300	[PATCH] take init_files to fs/file.c	2008-05-16 17:22:20 -04:00
ia64	fix build error of arch/ia64/kvm/*	2008-07-17 09:16:31 -07:00
m32r	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
m68k	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
m68knommu	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-07-16 17:25:46 -07:00
mips	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-07-16 17:25:46 -07:00
mn10300	mn10300: provide __ucmpdi2() for MN10300	2008-07-04 10:40:07 -07:00
parisc	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
powerpc	powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET	2008-07-16 11:43:48 -07:00
s390	[S390] Fix stacktrace compile bug.	2008-07-17 17:22:09 +02:00
sh	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-07-16 17:25:46 -07:00
sparc	sparc/mm/: possible cleanups	2008-07-17 21:38:01 -07:00
sparc64	sparc: Merge asm-sparc{,64}/mman.h	2008-07-17 21:41:51 -07:00
um	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
v850	[PATCH] take init_files to fs/file.c	2008-05-16 17:22:20 -04:00
x86	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-17 10:38:59 -07:00
xtensa	[PATCH] take init_files to fs/file.c	2008-05-16 17:22:20 -04:00
.gitignore
Kconfig	Add generic helpers for arch IPI function calls	2008-06-26 11:21:34 +02:00