Sam Ravnborg 6d1f4b88ee sparc: Merge asm-sparc{,64}/fcntl.h ... The definition of O_NDELAY differed - the rest was equal :$ diff -u include/asm-sparc/fcntl.h include/asm-sparc64/fcntl.h :-- include/asm-sparc/fcntl.h 2008-06-13 06:46:39.000000000 +0200 :++ include/asm-sparc64/fcntl.h 2008-06-13 06:46:39.000000000 +0200 :@@ -1,8 +1,9 @@ :-#ifndef _SPARC_FCNTL_H :-#define _SPARC_FCNTL_H :+#ifndef _SPARC64_FCNTL_H :+#define _SPARC64_FCNTL_H : : /* open/fcntl - O_SYNC is only implemented on blocks devices and on files : located on an ext2 file system */ :+#define O_NDELAY 0x0004 : #define O_APPEND 0x0008 : #define FASYNC 0x0040 /* fcntl, for BSD compatibility */ : #define O_CREAT 0x0200 /* not fcntl */ :@@ -10,7 +11,6 @@ : #define O_EXCL 0x0800 /* not fcntl */ : #define O_SYNC 0x2000 : #define O_NONBLOCK 0x4000 :-#define O_NDELAY (0x0004 | O_NONBLOCK) : #define O_NOCTTY 0x8000 /* not fcntl */ : #define O_LARGEFILE 0x40000 : #define O_DIRECT 0x100000 /* direct disk access hint */ :@@ -29,8 +29,7 @@ : #define F_UNLCK 3 : : #define __ARCH_FLOCK_PAD short __unused; :-#define __ARCH_FLOCK64_PAD short __unused; : : #include <asm-generic/fcntl.h> : :-#endif :+#endif /* !(_SPARC64_FCNTL_H) */ Signed-off-by: Sam Ravnborg <sam@ravnborg.org>		2008-07-17 21:41:39 -07:00
..
apc.h
asi.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
asmmacro.h
atomic.h	Add cmpxchg_local to sparc, move __cmpxchg to system.h	2008-02-07 08:42:32 -08:00
auxio.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
auxvec.h
bitext.h
bitops.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
bpp.h	[SPARC]: Merge asm-sparc{,64}/bpp.h	2008-02-09 04:00:12 -08:00
btfixup.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
bug.h	[SPARC]: Merge asm-sparc{,64}/bug.h	2008-02-09 04:00:32 -08:00
bugs.h	[SPARC]: Merge asm-sparc{,64}/bugs.h	2008-02-09 04:00:37 -08:00
byteorder.h	[SPARC]: Merge asm-sparc{,64}/byteorder.h	2008-02-09 04:17:28 -08:00
cache.h	[SPARC]: Merge asm-sparc{,64}/cache.h	2008-02-09 04:17:37 -08:00
cacheflush.h
checksum.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
clock.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
contregs.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
cpudata.h
cputime.h
current.h	[SPARC]: Merge asm-sparc{,64}/current.h	2008-02-09 04:17:54 -08:00
cypress.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
delay.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
device.h	[SPARC64]: NUMA device infrastructure.	2008-04-23 23:32:16 -07:00
display7seg.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
div64.h
dma-mapping.h
dma.h	[SPARC32]: __inline__ --> inline	2007-10-27 00:17:01 -07:00
ebus.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
ecc.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
eeprom.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
elf.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
emergency-restart.h
envctrl.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
errno.h	[SPARC]: Merge asm-sparc{,64}/errno.h	2008-02-09 04:18:23 -08:00
fb.h	[SPARC]: Merge asm-sparc{,64}/fb.h	2008-02-09 04:18:29 -08:00
fbio.h
fcntl.h	sparc: Merge asm-sparc{,64}/fcntl.h	2008-07-17 21:41:39 -07:00
fixmap.h
floppy.h	[SPARC] minor irq handler cleanups	2008-04-20 18:43:05 -04:00
futex.h
hardirq.h
head.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
highmem.h
hw_irq.h
ide.h	ide: remove ide_default_io_ctl() macro	2008-04-18 00:46:34 +02:00
idprom.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
io-unit.h
io.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
ioctl.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
ioctls.h	sparc: Merge asm-sparc{,64}/ioctls.h	2008-07-17 21:41:16 -07:00
iommu.h
ipcbuf.h
irq.h	[SPARC32]: Fix modular build of floppy driver.	2007-08-03 14:08:42 -07:00
irq_regs.h
irqflags.h	[SPARC32]: Add irqflags.h to sparc32 and use it from generic code.	2007-10-13 21:53:11 -07:00
jsflash.h
Kbuild	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
kdebug.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
kgdb.h	sparc: Add kgdb support.	2008-04-29 02:38:50 -07:00
kmap_types.h
kvm.h	kvm: provide kvm.h for all architecture: fixes headers_install	2008-04-02 15:28:18 -07:00
linkage.h
local.h
machines.h	sparc/kernel/: possible cleanups	2008-07-17 21:37:46 -07:00
mbus.h	sparc/mm/: possible cleanups	2008-07-17 21:38:01 -07:00
mc146818rtc.h
memreg.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
mman.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
mmu.h
mmu_context.h
module.h
mostek.h	sparc/kernel/: possible cleanups	2008-07-17 21:37:46 -07:00
mpmbox.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
msgbuf.h
msi.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
mutex.h
mxcc.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
namei.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
obio.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
of_device.h	Create linux/of_platorm.h	2007-07-20 14:25:22 +10:00
of_platform.h	[SPARC]: Remove of_platform_device_create	2008-02-09 03:49:58 -08:00
openprom.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
openpromio.h
oplib.h	sparc: remove PROM_AP1000	2008-07-17 21:38:24 -07:00
page.h	sparc/mm/: possible cleanups	2008-07-17 21:38:01 -07:00
param.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
pbm.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
pci.h	PCI: remove pci_dac_dma_... APIs	2007-07-11 16:02:11 -07:00
pcic.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
percpu.h
perfctr.h
pgalloc.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
pgtable.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
pgtsrmmu.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
pgtsun4.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
pgtsun4c.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
poll.h
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	2008-02-08 09:22:34 -08:00
processor.h	sparc: Remove old style signal frame support.	2008-04-27 02:26:36 -07:00
prom.h	[SPARC64]: NUMA device infrastructure.	2008-04-23 23:32:16 -07:00
psr.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
psrcompat.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
pstate.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
ptrace.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
reg.h
resource.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
ross.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
rtc.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sbi.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sbus.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
scatterlist.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sections.h
semaphore.h	Generic semaphore implementation	2008-04-17 10:42:34 -04:00
sembuf.h
setup.h
sfp-machine.h	[MATH-EMU]: Fix underflow exception reporting.	2007-08-16 22:59:49 -07:00
shmbuf.h
shmparam.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sigcontext.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
siginfo.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
signal.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
smp.h	smp_call_function: get rid of the unused nonatomic/retry argument	2008-06-26 11:24:35 +02:00
smpprim.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
socket.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sockios.h
spinlock.h
spinlock_types.h
stat.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
statfs.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
string.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sun4paddr.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
sun4prom.h
sunbpp.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
swift.h
sysen.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
system.h	sparc: Add kgdb support.	2008-04-29 02:38:50 -07:00
termbits.h	[SPARC]: Support for new termios.	2007-10-17 19:38:10 -07:00
termios.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
thread_info.h
timer.h	sparc/kernel/: possible cleanups	2008-07-17 21:37:46 -07:00
timex.h
tlb.h
tlbflush.h	remove unused flush_tlb_pgtables	2007-10-19 11:53:34 -07:00
topology.h
traps.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
tsunami.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
turbosparc.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
types.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
uaccess.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
uctx.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
unaligned.h	kernel: Move arches to use common unaligned access	2008-04-29 08:06:27 -07:00
unistd.h	[SPARC]: Add new timerfd syscall entries.	2008-02-06 04:12:23 -08:00
user.h	[SPARC]: Remove SunOS and Solaris binary support.	2008-04-21 15:10:15 -07:00
utrap.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
vac-ops.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
vaddrs.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
vfc_ioctls.h
vga.h
viking.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
watchdog.h	sparc: copy exported sparc64 specific header files to asm-sparc	2008-07-17 21:40:49 -07:00
winmacro.h	sparc: remove CVS keywords	2008-05-20 00:33:44 -07:00
xor.h