You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		17 years ago
..
alpha	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
arm	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	17 years ago
blackfin	Merge commit 'v2.6.26' into bkl-removal	17 years ago
cris	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
frv	PCI: remove unused arch pcibios_update_resource() functions	17 years ago
h8300	[PATCH] take init_files to fs/file.c	17 years ago
ia64	fix build error of arch/ia64/kvm/*	17 years ago
m32r	smp_call_function: get rid of the unused nonatomic/retry argument	17 years ago
m68k	Merge commit 'v2.6.26' into bkl-removal	17 years ago
m68knommu	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
mips	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
mn10300	mn10300: provide __ucmpdi2() for MN10300	17 years ago
parisc	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
powerpc	powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET	17 years ago
s390	[S390] Fix stacktrace compile bug.	17 years ago
sh	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	17 years ago
sparc	sparc/mm/: possible cleanups	17 years ago
sparc64	sparc: Merge asm-sparc{,64}/mman.h	17 years ago
um	Merge branch 'generic-ipi' into generic-ipi-for-linus	17 years ago
v850	[PATCH] take init_files to fs/file.c	17 years ago
x86	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	17 years ago
xtensa	[PATCH] take init_files to fs/file.c	17 years ago
.gitignore	…
Kconfig	Add generic helpers for arch IPI function calls	17 years ago