rpms/kernel/devel linux-2.6-header-cleanup-git.patch,1.9,1.10
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 28 14:07:23 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24051
Modified Files:
linux-2.6-header-cleanup-git.patch
Log Message:
Clean up unistd.h too
linux-2.6-header-cleanup-git.patch:
b/include/asm-i386/page.h | 5
b/include/asm-mips/unistd.h | 7
b/include/asm-powerpc/unistd.h | 8
b/include/asm-s390/ptrace.h | 6
b/include/asm-s390/unistd.h | 8
b/include/asm-x86_64/page.h | 5
b/include/linux/elf-em.h | 44 ++++
b/include/linux/unistd.h | 2
include/acpi/platform/aclinux.h | 1
include/acpi/processor.h | 1
include/asm-alpha/bitops.h | 1
include/asm-alpha/cache.h | 1
include/asm-alpha/cacheflush.h | 1
include/asm-alpha/core_cia.h | 1
include/asm-alpha/core_t2.h | 1
include/asm-alpha/dma-mapping.h | 1
include/asm-alpha/dma.h | 1
include/asm-alpha/floppy.h | 1
include/asm-alpha/hardirq.h | 1
include/asm-alpha/hw_irq.h | 1
include/asm-alpha/ide.h | 1
include/asm-alpha/io.h | 1
include/asm-alpha/irq.h | 1
include/asm-alpha/kmap_types.h | 1
include/asm-alpha/machvec.h | 1
include/asm-alpha/mmu_context.h | 1
include/asm-alpha/mmzone.h | 1
include/asm-alpha/page.h | 1
include/asm-alpha/param.h | 1
include/asm-alpha/pgalloc.h | 1
include/asm-alpha/pgtable.h | 1
include/asm-alpha/serial.h | 1
include/asm-alpha/smp.h | 1
include/asm-alpha/spinlock.h | 1
include/asm-alpha/system.h | 1
include/asm-alpha/tlbflush.h | 1
include/asm-alpha/unistd.h | 7
include/asm-arm/apm.h | 1
include/asm-arm/arch-aaec2000/memory.h | 1
include/asm-arm/arch-cl7500/acornfb.h | 1
include/asm-arm/arch-clps711x/hardware.h | 1
include/asm-arm/arch-clps711x/memory.h | 1
include/asm-arm/arch-clps711x/uncompress.h | 1
include/asm-arm/arch-ebsa285/hardware.h | 1
include/asm-arm/arch-ebsa285/memory.h | 1
include/asm-arm/arch-ebsa285/vmalloc.h | 1
include/asm-arm/arch-integrator/smp.h | 1
include/asm-arm/arch-iop3xx/memory.h | 1
include/asm-arm/arch-iop3xx/timex.h | 1
include/asm-arm/arch-iop3xx/uncompress.h | 1
include/asm-arm/arch-ixp4xx/dma.h | 1
include/asm-arm/arch-lh7a40x/constants.h | 1
include/asm-arm/arch-lh7a40x/irqs.h | 1
include/asm-arm/arch-lh7a40x/registers.h | 1
include/asm-arm/arch-omap/board.h | 1
include/asm-arm/arch-omap/hardware.h | 1
include/asm-arm/arch-omap/system.h | 1
include/asm-arm/arch-omap/uncompress.h | 1
include/asm-arm/arch-pxa/idp.h | 1
include/asm-arm/arch-pxa/irqs.h | 1
include/asm-arm/arch-pxa/pxa-regs.h | 1
include/asm-arm/arch-pxa/timex.h | 1
include/asm-arm/arch-realview/smp.h | 1
include/asm-arm/arch-s3c2410/dma.h | 1
include/asm-arm/arch-s3c2410/uncompress.h | 1
include/asm-arm/arch-sa1100/assabet.h | 1
include/asm-arm/arch-sa1100/cerf.h | 1
include/asm-arm/arch-sa1100/collie.h | 1
include/asm-arm/arch-sa1100/dma.h | 1
include/asm-arm/arch-sa1100/hardware.h | 1
include/asm-arm/arch-sa1100/ide.h | 1
include/asm-arm/arch-sa1100/irqs.h | 1
include/asm-arm/arch-sa1100/memory.h | 1
include/asm-arm/arch-sa1100/system.h | 1
include/asm-arm/atomic.h | 1
include/asm-arm/bug.h | 1
include/asm-arm/cacheflush.h | 1
include/asm-arm/cpu.h | 1
include/asm-arm/dma-mapping.h | 1
include/asm-arm/dma.h | 1
include/asm-arm/elf.h | 1
include/asm-arm/fpstate.h | 1
include/asm-arm/glue.h | 1
include/asm-arm/hardirq.h | 1
include/asm-arm/hardware/dec21285.h | 1
include/asm-arm/hardware/iomd.h | 1
include/asm-arm/leds.h | 1
include/asm-arm/mach/serial_at91rm9200.h | 1
include/asm-arm/mach/serial_sa1100.h | 1
include/asm-arm/memory.h | 1
include/asm-arm/page.h | 1
include/asm-arm/pci.h | 1
include/asm-arm/proc-fns.h | 1
include/asm-arm/ptrace.h | 1
include/asm-arm/smp.h | 1
include/asm-arm/system.h | 1
include/asm-arm/tlbflush.h | 1
include/asm-arm/unistd.h | 10 -
include/asm-arm26/atomic.h | 1
include/asm-arm26/bug.h | 1
include/asm-arm26/dma.h | 1
include/asm-arm26/hardirq.h | 1
include/asm-arm26/hardware.h | 1
include/asm-arm26/io.h | 1
include/asm-arm26/leds.h | 1
include/asm-arm26/mach-types.h | 1
include/asm-arm26/page.h | 1
include/asm-arm26/pgtable.h | 1
include/asm-arm26/serial.h | 1
include/asm-arm26/smp.h | 1
include/asm-arm26/sysirq.h | 1
include/asm-arm26/system.h | 1
include/asm-arm26/unistd.h | 10 -
include/asm-cris/arch-v10/io.h | 1
include/asm-cris/arch-v10/page.h | 1
include/asm-cris/arch-v10/system.h | 1
include/asm-cris/arch-v32/io.h | 1
include/asm-cris/arch-v32/irq.h | 1
include/asm-cris/arch-v32/page.h | 1
include/asm-cris/arch-v32/processor.h | 1
include/asm-cris/arch-v32/system.h | 1
include/asm-cris/eshlibld.h | 1
include/asm-cris/etraxgpio.h | 1
include/asm-cris/fasttimer.h | 1
include/asm-cris/page.h | 1
include/asm-cris/pci.h | 1
include/asm-cris/pgtable.h | 1
include/asm-cris/processor.h | 1
include/asm-cris/rtc.h | 1
include/asm-cris/tlbflush.h | 1
include/asm-cris/unistd.h | 9 -
include/asm-frv/atomic.h | 1
include/asm-frv/bitops.h | 1
include/asm-frv/bug.h | 1
include/asm-frv/cache.h | 1
include/asm-frv/dma.h | 1
include/asm-frv/elf.h | 1
include/asm-frv/fpu.h | 1
include/asm-frv/hardirq.h | 1
include/asm-frv/highmem.h | 1
include/asm-frv/ide.h | 1
include/asm-frv/io.h | 1
include/asm-frv/irq.h | 1
include/asm-frv/mmu_context.h | 1
include/asm-frv/page.h | 1
include/asm-frv/pci.h | 1
include/asm-frv/pgalloc.h | 1
include/asm-frv/pgtable.h | 1
include/asm-frv/processor.h | 1
include/asm-frv/segment.h | 1
include/asm-frv/serial.h | 1
include/asm-frv/smp.h | 1
include/asm-frv/system.h | 1
include/asm-frv/tlbflush.h | 1
include/asm-frv/types.h | 1
include/asm-frv/unaligned.h | 1
include/asm-frv/unistd.h | 7
include/asm-frv/virtconvert.h | 1
include/asm-generic/bug.h | 1
include/asm-generic/dma-mapping.h | 1
include/asm-generic/fcntl.h | 1
include/asm-generic/local.h | 1
include/asm-generic/signal.h | 7
include/asm-generic/tlb.h | 1
include/asm-h8300/bitops.h | 1
include/asm-h8300/dma.h | 1
include/asm-h8300/elf.h | 1
include/asm-h8300/hardirq.h | 1
include/asm-h8300/io.h | 1
include/asm-h8300/keyboard.h | 1
include/asm-h8300/mmu_context.h | 1
include/asm-h8300/page.h | 1
include/asm-h8300/page_offset.h | 1
include/asm-h8300/param.h | 1
include/asm-h8300/pgtable.h | 1
include/asm-h8300/processor.h | 1
include/asm-h8300/semaphore-helper.h | 1
include/asm-h8300/shm.h | 1
include/asm-h8300/system.h | 1
include/asm-h8300/unaligned.h | 1
include/asm-h8300/unistd.h | 7
include/asm-h8300/virtconvert.h | 1
include/asm-i386/apic.h | 1
include/asm-i386/atomic.h | 1
include/asm-i386/bitops.h | 1
include/asm-i386/bug.h | 1
include/asm-i386/bugs.h | 1
include/asm-i386/byteorder.h | 1
include/asm-i386/cache.h | 1
include/asm-i386/dma.h | 1
include/asm-i386/fixmap.h | 1
include/asm-i386/hardirq.h | 1
include/asm-i386/highmem.h | 1
include/asm-i386/hpet.h | 1
include/asm-i386/hw_irq.h | 1
include/asm-i386/ide.h | 1
include/asm-i386/io.h | 1
include/asm-i386/io_apic.h | 1
include/asm-i386/irq.h | 1
include/asm-i386/kmap_types.h | 1
include/asm-i386/mach-summit/mach_apic.h | 1
include/asm-i386/mmu_context.h | 1
include/asm-i386/mtrr.h | 1
include/asm-i386/param.h | 1
include/asm-i386/pci.h | 1
include/asm-i386/pgalloc.h | 1
include/asm-i386/pgtable.h | 1
include/asm-i386/processor.h | 1
include/asm-i386/serial.h | 1
include/asm-i386/smp.h | 1
include/asm-i386/spinlock.h | 1
include/asm-i386/string.h | 1
include/asm-i386/system.h | 1
include/asm-i386/thread_info.h | 1
include/asm-i386/timex.h | 1
include/asm-i386/tlbflush.h | 1
include/asm-i386/types.h | 1
include/asm-i386/uaccess.h | 1
include/asm-i386/unistd.h | 7
include/asm-ia64/asmmacro.h | 1
include/asm-ia64/cache.h | 1
include/asm-ia64/delay.h | 1
include/asm-ia64/dma-mapping.h | 1
include/asm-ia64/dma.h | 1
include/asm-ia64/elf.h | 1
include/asm-ia64/hardirq.h | 1
include/asm-ia64/ia32.h | 1
include/asm-ia64/ide.h | 1
include/asm-ia64/intrinsics.h | 1
include/asm-ia64/kmap_types.h | 1
include/asm-ia64/machvec.h | 1
include/asm-ia64/meminit.h | 1
include/asm-ia64/nodedata.h | 1
include/asm-ia64/numa.h | 1
include/asm-ia64/page.h | 1
include/asm-ia64/param.h | 1
include/asm-ia64/percpu.h | 1
include/asm-ia64/pgalloc.h | 1
include/asm-ia64/pgtable.h | 1
include/asm-ia64/processor.h | 1
include/asm-ia64/ptrace.h | 1
include/asm-ia64/smp.h | 1
include/asm-ia64/sn/simulator.h | 1
include/asm-ia64/sn/sn_cpuid.h | 1
include/asm-ia64/sn/sn_sal.h | 1
include/asm-ia64/sn/xpc.h | 1
include/asm-ia64/string.h | 1
include/asm-ia64/system.h | 1
include/asm-ia64/tlb.h | 1
include/asm-ia64/tlbflush.h | 1
include/asm-ia64/unistd.h | 1
include/asm-m32r/assembler.h | 1
include/asm-m32r/atomic.h | 1
include/asm-m32r/bitops.h | 1
include/asm-m32r/cacheflush.h | 1
include/asm-m32r/hardirq.h | 1
include/asm-m32r/ide.h | 1
include/asm-m32r/irq.h | 1
include/asm-m32r/kmap_types.h | 1
include/asm-m32r/m32104ut/m32104ut_pld.h | 1
include/asm-m32r/m32700ut/m32700ut_lan.h | 1
include/asm-m32r/m32700ut/m32700ut_lcd.h | 1
include/asm-m32r/m32700ut/m32700ut_pld.h | 1
include/asm-m32r/m32r.h | 1
include/asm-m32r/mmu.h | 1
include/asm-m32r/mmu_context.h | 2
include/asm-m32r/opsput/opsput_lan.h | 1
include/asm-m32r/opsput/opsput_lcd.h | 1
include/asm-m32r/opsput/opsput_pld.h | 1
include/asm-m32r/page.h | 1
include/asm-m32r/pgalloc.h | 1
include/asm-m32r/pgtable-2level.h | 1
include/asm-m32r/pgtable.h | 1
include/asm-m32r/processor.h | 1
include/asm-m32r/ptrace.h | 1
include/asm-m32r/rtc.h | 1
include/asm-m32r/semaphore.h | 1
include/asm-m32r/serial.h | 1
include/asm-m32r/sigcontext.h | 1
include/asm-m32r/smp.h | 1
include/asm-m32r/spinlock.h | 1
include/asm-m32r/system.h | 1
include/asm-m32r/timex.h | 1
include/asm-m32r/tlbflush.h | 1
include/asm-m32r/uaccess.h | 1
include/asm-m32r/unistd.h | 5
include/asm-m68k/atomic.h | 1
include/asm-m68k/bug.h | 1
include/asm-m68k/dma-mapping.h | 1
include/asm-m68k/dma.h | 1
include/asm-m68k/dvma.h | 1
include/asm-m68k/elf.h | 1
include/asm-m68k/entry.h | 1
include/asm-m68k/fpu.h | 1
include/asm-m68k/hardirq.h | 1
include/asm-m68k/ide.h | 1
include/asm-m68k/io.h | 1
include/asm-m68k/irq.h | 1
include/asm-m68k/mc146818rtc.h | 1
include/asm-m68k/mmu_context.h | 1
include/asm-m68k/motorola_pgtable.h | 1
include/asm-m68k/openprom.h | 1
include/asm-m68k/page.h | 1
include/asm-m68k/page_offset.h | 1
include/asm-m68k/pgalloc.h | 1
include/asm-m68k/pgtable.h | 1
include/asm-m68k/processor.h | 1
include/asm-m68k/semaphore-helper.h | 1
include/asm-m68k/serial.h | 1
include/asm-m68k/setup.h | 1
include/asm-m68k/shm.h | 1
include/asm-m68k/system.h | 1
include/asm-m68k/tlbflush.h | 1
include/asm-m68k/unistd.h | 7
include/asm-m68k/virtconvert.h | 1
include/asm-m68knommu/bitops.h | 1
include/asm-m68knommu/coldfire.h | 1
include/asm-m68knommu/commproc.h | 1
include/asm-m68knommu/dma-mapping.h | 1
include/asm-m68knommu/dma.h | 1
include/asm-m68knommu/elf.h | 1
include/asm-m68knommu/elia.h | 1
include/asm-m68knommu/entry.h | 1
include/asm-m68knommu/fpu.h | 1
include/asm-m68knommu/hardirq.h | 1
include/asm-m68knommu/io.h | 1
include/asm-m68knommu/irq.h | 1
include/asm-m68knommu/m5206sim.h | 1
include/asm-m68knommu/m520xsim.h | 1
include/asm-m68knommu/m523xsim.h | 1
include/asm-m68knommu/m5272sim.h | 1
include/asm-m68knommu/m527xsim.h | 1
include/asm-m68knommu/m528xsim.h | 1
include/asm-m68knommu/mcfcache.h | 1
include/asm-m68knommu/mcfdma.h | 1
include/asm-m68knommu/mcfmbus.h | 1
include/asm-m68knommu/mcfne.h | 1
include/asm-m68knommu/mcfpci.h | 1
include/asm-m68knommu/mcfpit.h | 1
include/asm-m68knommu/mcfsim.h | 1
include/asm-m68knommu/mcfsmc.h | 1
include/asm-m68knommu/mcftimer.h | 1
include/asm-m68knommu/mcfuart.h | 1
include/asm-m68knommu/mcfwdebug.h | 1
include/asm-m68knommu/mmu_context.h | 1
include/asm-m68knommu/nettel.h | 1
include/asm-m68knommu/page.h | 1
include/asm-m68knommu/page_offset.h | 1
include/asm-m68knommu/param.h | 1
include/asm-m68knommu/pgtable.h | 1
include/asm-m68knommu/processor.h | 1
include/asm-m68knommu/semaphore-helper.h | 1
include/asm-m68knommu/system.h | 1
include/asm-m68knommu/unaligned.h | 1
include/asm-m68knommu/unistd.h | 7
include/asm-mips/a.out.h | 1
include/asm-mips/addrspace.h | 1
include/asm-mips/arc/types.h | 1
include/asm-mips/asm.h | 1
include/asm-mips/asmmacro.h | 1
include/asm-mips/atomic.h | 1
include/asm-mips/bcache.h | 1
include/asm-mips/bitops.h | 1
include/asm-mips/bug.h | 1
include/asm-mips/bugs.h | 1
include/asm-mips/byteorder.h | 1
include/asm-mips/cache.h | 1
include/asm-mips/checksum.h | 1
include/asm-mips/cpu-features.h | 1
include/asm-mips/cpu-info.h | 1
include/asm-mips/ddb5xxx/ddb5477.h | 1
include/asm-mips/ddb5xxx/ddb5xxx.h | 1
include/asm-mips/debug.h | 1
include/asm-mips/dec/prom.h | 1
include/asm-mips/delay.h | 1
include/asm-mips/dma.h | 1
include/asm-mips/elf.h | 1
include/asm-mips/fcntl.h | 1
include/asm-mips/fixmap.h | 1
include/asm-mips/fpu.h | 1
include/asm-mips/futex.h | 1
include/asm-mips/hazards.h | 1
include/asm-mips/highmem.h | 1
include/asm-mips/interrupt.h | 1
include/asm-mips/io.h | 1
include/asm-mips/ip32/machine.h | 1
include/asm-mips/irq.h | 1
include/asm-mips/isadep.h | 1
include/asm-mips/jmr3927/irq.h | 1
include/asm-mips/kmap_types.h | 1
include/asm-mips/local.h | 1
include/asm-mips/mach-au1x00/au1000.h | 1
include/asm-mips/mach-au1x00/au1xxx.h | 1
include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 1
include/asm-mips/mach-au1x00/au1xxx_ide.h | 1
include/asm-mips/mach-au1x00/au1xxx_psc.h | 1
include/asm-mips/mach-au1x00/ioremap.h | 1
include/asm-mips/mach-cobalt/cpu-feature-overrides.h | 1
include/asm-mips/mach-db1x00/db1x00.h | 1
include/asm-mips/mach-generic/ide.h | 1
include/asm-mips/mach-generic/kmalloc.h | 1
include/asm-mips/mach-generic/spaces.h | 1
include/asm-mips/mach-ip22/spaces.h | 1
include/asm-mips/mach-ip32/cpu-feature-overrides.h | 1
include/asm-mips/mach-ip32/kmalloc.h | 1
include/asm-mips/mach-mips/cpu-feature-overrides.h | 1
include/asm-mips/mach-mips/irq.h | 1
include/asm-mips/mach-pb1x00/pb1550.h | 1
include/asm-mips/mach-sim/cpu-feature-overrides.h | 1
include/asm-mips/mips-boards/generic.h | 1
include/asm-mips/mipsregs.h | 1
include/asm-mips/mmu_context.h | 1
include/asm-mips/mmzone.h | 1
include/asm-mips/module.h | 1
include/asm-mips/msgbuf.h | 1
include/asm-mips/paccess.h | 1
include/asm-mips/page.h | 1
include/asm-mips/pci.h | 1
include/asm-mips/pgalloc.h | 1
include/asm-mips/pgtable-32.h | 1
include/asm-mips/pgtable-64.h | 1
include/asm-mips/pgtable-bits.h | 1
include/asm-mips/pgtable.h | 1
include/asm-mips/prefetch.h | 1
include/asm-mips/processor.h | 1
include/asm-mips/ptrace.h | 1
include/asm-mips/reg.h | 1
include/asm-mips/resource.h | 1
include/asm-mips/serial.h | 1
include/asm-mips/sgiarcs.h | 1
include/asm-mips/sibyte/board.h | 1
include/asm-mips/sibyte/carmel.h | 1
include/asm-mips/sibyte/sentosa.h | 1
include/asm-mips/sibyte/swarm.h | 1
include/asm-mips/siginfo.h | 1
include/asm-mips/signal.h | 1
include/asm-mips/sim.h | 1
include/asm-mips/smp.h | 1
include/asm-mips/sn/addrs.h | 1
include/asm-mips/sn/agent.h | 1
include/asm-mips/sn/arch.h | 1
include/asm-mips/sn/io.h | 1
include/asm-mips/sn/klconfig.h | 1
include/asm-mips/sn/kldir.h | 1
include/asm-mips/sn/launch.h | 1
include/asm-mips/sn/mapped_kernel.h | 1
include/asm-mips/sn/sn0/addrs.h | 1
include/asm-mips/sn/sn0/arch.h | 1
include/asm-mips/sn/sn0/hubmd.h | 1
include/asm-mips/stackframe.h | 1
include/asm-mips/string.h | 1
include/asm-mips/system.h | 1
include/asm-mips/thread_info.h | 1
include/asm-mips/tlbflush.h | 1
include/asm-mips/tx4927/toshiba_rbtx4927.h | 1
include/asm-mips/types.h | 1
include/asm-mips/uaccess.h | 1
include/asm-mips/vr41xx/vrc4173.h | 1
include/asm-mips/war.h | 1
include/asm-mips/wbflush.h | 1
include/asm-parisc/atomic.h | 1
include/asm-parisc/cache.h | 1
include/asm-parisc/cacheflush.h | 1
include/asm-parisc/dma-mapping.h | 1
include/asm-parisc/dma.h | 1
include/asm-parisc/io.h | 1
include/asm-parisc/irq.h | 1
include/asm-parisc/kmap_types.h | 1
include/asm-parisc/page.h | 1
include/asm-parisc/param.h | 1
include/asm-parisc/pci.h | 1
include/asm-parisc/pdc.h | 1
include/asm-parisc/pgtable.h | 1
include/asm-parisc/processor.h | 1
include/asm-parisc/psw.h | 1
include/asm-parisc/smp.h | 1
include/asm-parisc/system.h | 1
include/asm-parisc/tlbflush.h | 1
include/asm-parisc/unistd.h | 4
include/asm-powerpc/abs_addr.h | 1
include/asm-powerpc/cache.h | 1
include/asm-powerpc/dma-mapping.h | 1
include/asm-powerpc/dma.h | 1
include/asm-powerpc/eeh.h | 1
include/asm-powerpc/elf.h | 7
include/asm-powerpc/floppy.h | 1
include/asm-powerpc/hw_irq.h | 1
include/asm-powerpc/ide.h | 1
include/asm-powerpc/iommu.h | 1
include/asm-powerpc/irq.h | 1
include/asm-powerpc/iseries/iseries_io.h | 1
include/asm-powerpc/machdep.h | 1
include/asm-powerpc/mmzone.h | 1
include/asm-powerpc/paca.h | 1
include/asm-powerpc/page.h | 1
include/asm-powerpc/pgtable.h | 1
include/asm-powerpc/ppc_asm.h | 1
include/asm-powerpc/prom.h | 1
include/asm-powerpc/smp.h | 1
include/asm-powerpc/smu.h | 1
include/asm-powerpc/spu.h | 1
include/asm-powerpc/thread_info.h | 1
include/asm-powerpc/time.h | 1
include/asm-powerpc/timex.h | 1
include/asm-powerpc/tlb.h | 1
include/asm-powerpc/tlbflush.h | 1
include/asm-powerpc/topology.h | 1
include/asm-powerpc/types.h | 1
include/asm-powerpc/vga.h | 1
include/asm-powerpc/vio.h | 1
include/asm-ppc/amigahw.h | 1
include/asm-ppc/bootinfo.h | 1
include/asm-ppc/commproc.h | 1
include/asm-ppc/ibm403.h | 1
include/asm-ppc/ibm44x.h | 1
include/asm-ppc/ibm4xx.h | 1
include/asm-ppc/io.h | 1
include/asm-ppc/machdep.h | 1
include/asm-ppc/mmu.h | 1
include/asm-ppc/mmu_context.h | 1
include/asm-ppc/mpc8260.h | 1
include/asm-ppc/mpc83xx.h | 1
include/asm-ppc/mpc85xx.h | 1
include/asm-ppc/mpc8xx.h | 1
include/asm-ppc/mv64x60.h | 1
include/asm-ppc/ocp.h | 1
include/asm-ppc/open_pic.h | 1
include/asm-ppc/page.h | 2
include/asm-ppc/pc_serial.h | 1
include/asm-ppc/pgalloc.h | 1
include/asm-ppc/pgtable.h | 1
include/asm-ppc/ppc4xx_dma.h | 1
include/asm-ppc/ppc4xx_pic.h | 1
include/asm-ppc/serial.h | 1
include/asm-ppc/smp.h | 1
include/asm-ppc/time.h | 1
include/asm-s390/bitops.h | 1
include/asm-s390/debug.h | 1
include/asm-s390/hardirq.h | 1
include/asm-s390/idals.h | 1
include/asm-s390/local.h | 1
include/asm-s390/lowcore.h | 1
include/asm-s390/page.h | 6
include/asm-s390/pgalloc.h | 1
include/asm-s390/sfp-machine.h | 1
include/asm-s390/smp.h | 1
include/asm-s390/system.h | 1
include/asm-s390/tlbflush.h | 1
include/asm-s390/types.h | 1
include/asm-sh/bug.h | 1
include/asm-sh/checksum.h | 1
include/asm-sh/dma-mapping.h | 1
include/asm-sh/dma.h | 1
include/asm-sh/fixmap.h | 1
include/asm-sh/hardirq.h | 1
include/asm-sh/hd64461/hd64461.h | 1
include/asm-sh/hd64465/hd64465.h | 1
include/asm-sh/ide.h | 1
include/asm-sh/io.h | 1
include/asm-sh/irq.h | 1
include/asm-sh/keyboard.h | 1
include/asm-sh/kmap_types.h | 1
include/asm-sh/machvec.h | 1
include/asm-sh/machvec_init.h | 1
include/asm-sh/mpc1211/dma.h | 1
include/asm-sh/overdrive/overdrive.h | 1
include/asm-sh/page.h | 1
include/asm-sh/pgtable.h | 1
include/asm-sh/serial.h | 1
include/asm-sh/smp.h | 1
include/asm-sh/system.h | 1
include/asm-sh/types.h | 1
include/asm-sh/unistd.h | 7
include/asm-sh/watchdog.h | 1
include/asm-sh64/bug.h | 1
include/asm-sh64/dma-mapping.h | 1
include/asm-sh64/hardirq.h | 1
include/asm-sh64/ide.h | 1
include/asm-sh64/irq.h | 1
include/asm-sh64/mmu_context.h | 1
include/asm-sh64/page.h | 1
include/asm-sh64/param.h | 1
include/asm-sh64/pgtable.h | 1
include/asm-sh64/system.h | 1
include/asm-sh64/unistd.h | 7
include/asm-sparc/asmmacro.h | 1
include/asm-sparc/atomic.h | 1
include/asm-sparc/bugs.h | 1
include/asm-sparc/cacheflush.h | 1
include/asm-sparc/delay.h | 1
include/asm-sparc/dma-mapping.h | 1
include/asm-sparc/dma.h | 1
include/asm-sparc/elf.h | 1
include/asm-sparc/fixmap.h | 1
include/asm-sparc/hardirq.h | 1
include/asm-sparc/ide.h | 1
include/asm-sparc/irq.h | 1
include/asm-sparc/mostek.h | 1
include/asm-sparc/page.h | 1
include/asm-sparc/pgalloc.h | 1
include/asm-sparc/pgtable.h | 1
include/asm-sparc/sfp-machine.h | 1
include/asm-sparc/smp.h | 1
include/asm-sparc/system.h | 2
include/asm-sparc/timer.h | 1
include/asm-sparc/tlbflush.h | 1
include/asm-sparc/unistd.h | 4
include/asm-sparc/vac-ops.h | 1
include/asm-sparc/winmacro.h | 1
include/asm-sparc64/atomic.h | 1
include/asm-sparc64/bitops.h | 1
include/asm-sparc64/bugs.h | 1
include/asm-sparc64/cacheflush.h | 1
include/asm-sparc64/delay.h | 1
include/asm-sparc64/dma-mapping.h | 1
include/asm-sparc64/dma.h | 1
include/asm-sparc64/floppy.h | 1
include/asm-sparc64/ide.h | 1
include/asm-sparc64/irq.h | 1
include/asm-sparc64/kprobes.h | 1
include/asm-sparc64/mc146818rtc.h | 1
include/asm-sparc64/mmu.h | 1
include/asm-sparc64/oplib.h | 1
include/asm-sparc64/page.h | 1
include/asm-sparc64/param.h | 1
include/asm-sparc64/pgalloc.h | 1
include/asm-sparc64/pgtable.h | 1
include/asm-sparc64/processor.h | 1
include/asm-sparc64/siginfo.h | 1
include/asm-sparc64/signal.h | 1
include/asm-sparc64/smp.h | 1
include/asm-sparc64/spinlock.h | 1
include/asm-sparc64/system.h | 1
include/asm-sparc64/timer.h | 1
include/asm-sparc64/tlb.h | 1
include/asm-sparc64/tlbflush.h | 1
include/asm-sparc64/ttable.h | 1
include/asm-sparc64/unistd.h | 4
include/asm-um/a.out.h | 1
include/asm-um/cache.h | 1
include/asm-um/elf-ppc.h | 1
include/asm-um/fixmap.h | 1
include/asm-um/hardirq.h | 1
include/asm-um/linkage.h | 1
include/asm-um/mmu_context.h | 1
include/asm-um/page.h | 1
include/asm-um/pgalloc.h | 1
include/asm-um/processor-generic.h | 1
include/asm-um/ptrace-generic.h | 1
include/asm-um/smp.h | 1
include/asm-um/thread_info.h | 1
include/asm-v850/atomic.h | 1
include/asm-v850/bitops.h | 1
include/asm-v850/dma-mapping.h | 1
include/asm-v850/hardirq.h | 1
include/asm-v850/machdep.h | 1
include/asm-v850/pgtable.h | 1
include/asm-v850/processor.h | 1
include/asm-v850/serial.h | 1
include/asm-v850/unistd.h | 12 -
include/asm-v850/v850e_uart.h | 1
include/asm-x86_64/apic.h | 1
include/asm-x86_64/atomic.h | 1
include/asm-x86_64/bitops.h | 1
include/asm-x86_64/bugs.h | 1
include/asm-x86_64/cache.h | 1
include/asm-x86_64/calling.h | 1
include/asm-x86_64/dma-mapping.h | 1
include/asm-x86_64/dma.h | 1
include/asm-x86_64/dwarf2.h | 1
include/asm-x86_64/fixmap.h | 1
include/asm-x86_64/hardirq.h | 1
include/asm-x86_64/hw_irq.h | 1
include/asm-x86_64/ia32.h | 1
include/asm-x86_64/io.h | 1
include/asm-x86_64/io_apic.h | 1
include/asm-x86_64/mmu_context.h | 1
include/asm-x86_64/mmzone.h | 1
include/asm-x86_64/mtrr.h | 1
include/asm-x86_64/param.h | 1
include/asm-x86_64/pci.h | 1
include/asm-x86_64/processor.h | 1
include/asm-x86_64/serial.h | 1
include/asm-x86_64/smp.h | 1
include/asm-x86_64/spinlock.h | 1
include/asm-x86_64/swiotlb.h | 1
include/asm-x86_64/system.h | 1
include/asm-x86_64/tlbflush.h | 1
include/asm-x86_64/topology.h | 1
include/asm-x86_64/uaccess.h | 1
include/asm-x86_64/unistd.h | 7
include/asm-xtensa/atomic.h | 1
include/asm-xtensa/checksum.h | 1
include/asm-xtensa/delay.h | 1
include/asm-xtensa/dma.h | 1
include/asm-xtensa/hardirq.h | 1
include/asm-xtensa/ide.h | 1
include/asm-xtensa/io.h | 1
include/asm-xtensa/irq.h | 1
include/asm-xtensa/mmu_context.h | 1
include/asm-xtensa/page.h | 1
include/asm-xtensa/pgalloc.h | 1
include/asm-xtensa/platform.h | 1
include/asm-xtensa/system.h | 1
include/asm-xtensa/unistd.h | 21 --
include/linux/acct.h | 3
include/linux/acpi.h | 1
include/linux/agpgart.h | 3
include/linux/amba/clcd.h | 1
include/linux/atmdev.h | 1
include/linux/audit.h | 4
include/linux/blkdev.h | 1
include/linux/blkpg.h | 1
include/linux/blktrace_api.h | 1
include/linux/blockgroup_lock.h | 1
include/linux/cache.h | 1
include/linux/coda.h | 1
include/linux/compat.h | 1
include/linux/cpufreq.h | 1
include/linux/crypto.h | 1
include/linux/cyclomx.h | 1
include/linux/dcookies.h | 1
include/linux/devfs_fs_kernel.h | 1
include/linux/device.h | 1
include/linux/dmi.h | 1
include/linux/dnotify.h | 1
include/linux/elf.h | 59 ------
include/linux/errqueue.h | 1
include/linux/ethtool.h | 169 +++++++++----------
include/linux/ext2_fs.h | 2
include/linux/ext3_fs.h | 7
include/linux/fs.h | 1
include/linux/ftape.h | 1
include/linux/gameport.h | 6
include/linux/generic_serial.h | 6
include/linux/genhd.h | 12 -
include/linux/gfp.h | 1
include/linux/hardirq.h | 1
include/linux/highmem.h | 1
include/linux/highuid.h | 1
include/linux/i2c-algo-ite.h | 7
include/linux/i2c.h | 9 -
include/linux/ide.h | 1
include/linux/if_frad.h | 1
include/linux/if_tr.h | 1
include/linux/init.h | 1
include/linux/inotify.h | 1
include/linux/input.h | 41 ----
include/linux/interrupt.h | 1
include/linux/ipmi.h | 2
include/linux/ipv6.h | 1
include/linux/irq.h | 1
include/linux/irq_cpustat.h | 1
include/linux/isapnp.h | 1
include/linux/isdn.h | 1
include/linux/isdn/tpam.h | 1
include/linux/isdn_ppp.h | 1
include/linux/isdnif.h | 1
include/linux/kallsyms.h | 1
include/linux/kernel_stat.h | 1
include/linux/kmod.h | 1
include/linux/kprobes.h | 1
include/linux/linkage.h | 1
include/linux/lockd/lockd.h | 1
include/linux/lockd/nlm.h | 1
include/linux/mempolicy.h | 1
include/linux/migrate.h | 1
include/linux/mii.h | 30 +--
include/linux/mm.h | 1
include/linux/mman.h | 12 -
include/linux/mmzone.h | 1
include/linux/mod_devicetable.h | 38 ++++
include/linux/module.h | 1
include/linux/msg.h | 2
include/linux/mtd/cfi.h | 1
include/linux/mtd/map.h | 1
include/linux/mtd/mtd.h | 1
include/linux/mtd/nand.h | 1
include/linux/mtd/physmap.h | 1
include/linux/mtd/xip.h | 1
include/linux/ncp_fs.h | 5
include/linux/net.h | 3
include/linux/netdevice.h | 1
include/linux/netfilter.h | 1
include/linux/netfilter_arp.h | 1
include/linux/netfilter_bridge.h | 1
include/linux/netfilter_ipv4.h | 1
include/linux/netfilter_ipv4/ip_conntrack.h | 1
include/linux/netfilter_ipv4/listhelp.h | 1
include/linux/nfs.h | 8
include/linux/nfs4.h | 6
include/linux/nfs_fs.h | 39 ++--
include/linux/nfsd/nfsd.h | 1
include/linux/nfsd/nfsfh.h | 1
include/linux/nfsd/syscall.h | 1
include/linux/numa.h | 1
include/linux/parport.h | 1
include/linux/pci.h | 1
include/linux/percpu_counter.h | 1
include/linux/pm.h | 1
include/linux/pm_legacy.h | 1
include/linux/pmu.h | 1
include/linux/preempt.h | 1
include/linux/proc_fs.h | 1
include/linux/profile.h | 1
include/linux/quota.h | 4
include/linux/quotaops.h | 1
include/linux/reiserfs_xattr.h | 3
include/linux/relay.h | 1
include/linux/rio.h | 1
include/linux/rio_drv.h | 1
include/linux/rmap.h | 1
include/linux/rtnetlink.h | 1
include/linux/rwsem.h | 1
include/linux/scc.h | 1
include/linux/sched.h | 94 +++++-----
include/linux/seccomp.h | 1
include/linux/sem.h | 2
include/linux/seqlock.h | 1
include/linux/serialP.h | 1
include/linux/serial_core.h | 1
include/linux/signal.h | 4
include/linux/skbuff.h | 1
include/linux/slab.h | 1
include/linux/smb_fs.h | 4
include/linux/smp.h | 1
include/linux/smp_lock.h | 1
include/linux/socket.h | 2
include/linux/spinlock.h | 1
include/linux/stop_machine.h | 1
include/linux/sunrpc/auth.h | 1
include/linux/sunrpc/debug.h | 24 +-
include/linux/sunrpc/stats.h | 1
include/linux/suspend.h | 1
include/linux/swap.h | 1
include/linux/syscalls.h | 1
include/linux/sysrq.h | 1
include/linux/tcp.h | 1
include/linux/threads.h | 1
include/linux/timer.h | 1
include/linux/timex.h | 1
include/linux/tty.h | 1
include/linux/types.h | 1
include/linux/udp.h | 1
include/linux/usb.h | 1
include/linux/usb_usual.h | 1
include/linux/usbdevice_fs.h | 2
include/linux/vt_buffer.h | 1
include/linux/vt_kern.h | 1
include/linux/wait.h | 1
include/linux/wanrouter.h | 4
include/mtd/mtd-abi.h | 5
include/net/addrconf.h | 1
include/net/af_unix.h | 1
include/net/ax25.h | 1
include/net/compat.h | 1
include/net/dst.h | 1
include/net/icmp.h | 1
include/net/inet6_hashtables.h | 1
include/net/inet_hashtables.h | 1
include/net/inet_sock.h | 1
include/net/inet_timewait_sock.h | 1
include/net/ip.h | 1
include/net/ip_fib.h | 1
include/net/ip_mp_alg.h | 1
include/net/ip_vs.h | 1
include/net/ipv6.h | 1
include/net/irda/irda.h | 1
include/net/irda/irda_device.h | 1
include/net/irda/irlap.h | 1
include/net/irda/irlmp.h | 1
include/net/irda/irlmp_frame.h | 1
include/net/irda/qos.h | 1
include/net/ndisc.h | 1
include/net/netfilter/nf_conntrack.h | 1
include/net/pkt_act.h | 1
include/net/protocol.h | 1
include/net/raw.h | 1
include/net/red.h | 1
include/net/route.h | 1
include/net/sch_generic.h | 1
include/net/sctp/sctp.h | 1
include/net/sock.h | 1
include/net/tcp.h | 1
include/pcmcia/ss.h | 1
include/scsi/scsi_transport_fc.h | 1
include/scsi/scsi_transport_spi.h | 1
include/sound/driver.h | 1
include/video/edid.h | 1
include/video/vga.h | 1
scripts/mod/file2alias.c | 1
891 files changed, 430 insertions(+), 1269 deletions(-)
Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-header-cleanup-git.patch 28 Apr 2006 12:02:43 -0000 1.9
+++ linux-2.6-header-cleanup-git.patch 28 Apr 2006 14:07:00 -0000 1.10
@@ -4834,17 +4834,40 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/thread_info.h>
-unchanged:
---- a/include/asm-mips/unistd.h
+diff -u b/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
+--- b/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
-@@ -1170,7 +1170,6 @@ #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32
+@@ -905,6 +905,8 @@
+ #define __NR_N32_Linux 6000
+ #define __NR_N32_Linux_syscalls 268
- #ifdef __KERNEL__
++#ifdef __KERNEL__
++
+ #ifndef __ASSEMBLY__
+
+ /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
+@@ -1168,9 +1170,6 @@
+
+ #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
+-#ifdef __KERNEL__
+-
-#include <linux/config.h>
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
+@@ -1197,7 +1196,6 @@
+ # ifdef CONFIG_MIPS32_O32
+ # define __ARCH_WANT_COMPAT_SYS_TIME
+ # endif
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -1250,2 +1248,3 @@
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_UNISTD_H */
unchanged:
--- a/include/asm-mips/vr41xx/vrc4173.h
+++ b/include/asm-mips/vr41xx/vrc4173.h
@@ -5420,17 +5443,41 @@
typedef signed char s8;
typedef unsigned char u8;
-unchanged:
---- a/include/asm-powerpc/unistd.h
+diff -u b/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
+--- b/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
-@@ -423,7 +423,6 @@ type name(type1 arg1, type2 arg2, type3
+@@ -305,12 +305,12 @@
+ #define __NR_tee 284
+ #define __NR_vmsplice 285
- #ifdef __KERNEL__
++#ifdef __KERNEL__
++
+ #define __NR_syscalls 286
+
+-#ifdef __KERNEL__
+ #define __NR__exit __NR_exit
+ #define NR_syscalls __NR_syscalls
+-#endif
+
+ #ifndef __ASSEMBLY__
+
+@@ -423,7 +423,5 @@
+ }
+
+-#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/compiler.h>
- #include <linux/linkage.h>
+@@ -480,7 +478,7 @@
+ #endif
+
+-#endif /* __KERNEL__ */
+
+ #endif /* __ASSEMBLY__ */
++#endif /* __KERNEL__ */
+
+ #endif /* _ASM_PPC_UNISTD_H_ */
unchanged:
--- a/include/asm-powerpc/vga.h
+++ b/include/asm-powerpc/vga.h
@@ -5904,10 +5951,31 @@
typedef signed char s8;
typedef unsigned char u8;
-unchanged:
---- a/include/asm-s390/unistd.h
+diff -u b/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
+--- b/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
-@@ -571,7 +571,6 @@ #endif
+@@ -386,6 +386,8 @@
+
+ #endif
+
++#ifdef __KERNEL__
++
+ /* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */
+
+ #define __syscall_return(type, res) \
+@@ -540,7 +542,6 @@
+ __syscall_return(type,__res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_SYS_ALARM
+@@ -567,11 +568,9 @@
+ # define __ARCH_WANT_COMPAT_SYS_TIME
+ # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+ # endif
+-#endif
#ifdef __KERNEL_SYSCALLS__
@@ -5915,6 +5983,19 @@
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/ptrace.h>
+@@ -619,7 +618,7 @@
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -631,2 +630,3 @@
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_S390_UNISTD_H_ */
unchanged:
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -10654,19 +10735,19 @@
-
+#endif /* __KERNEL__ */
#endif /* __LINUX_MII_H__ */
-unchanged:
---- a/include/linux/unistd.h
+diff -u b/include/linux/unistd.h b/include/linux/unistd.h
+--- b/include/linux/unistd.h
+++ b/include/linux/unistd.h
-@@ -1,8 +1,6 @@
+@@ -1,7 +1,9 @@
#ifndef _LINUX_UNISTD_H_
#define _LINUX_UNISTD_H_
--extern int errno;
--
++#ifdef __KERNEL__
+ extern int errno;
++#endif
+
/*
* Include machine specific syscallX macros
- */
-only in patch2:
unchanged:
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -10739,7 +10820,6 @@
struct input_handler {
-only in patch2:
unchanged:
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -10786,7 +10866,6 @@
+
+
#endif /* LINUX_MOD_DEVICETABLE_H */
-only in patch2:
unchanged:
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -10798,3 +10877,777 @@
#define ADD(str, sep, cond, field) \
do { \
+only in patch2:
+unchanged:
+--- a/include/asm-alpha/unistd.h
++++ b/include/asm-alpha/unistd.h
+@@ -383,6 +383,8 @@ #define __NR_inotify_init 444
+ #define __NR_inotify_add_watch 445
+ #define __NR_inotify_rm_watch 446
+
++#ifdef __KERNEL__
++
+ #define NR_SYSCALLS 447
+
+ #if defined(__GNUC__)
+@@ -565,9 +567,8 @@ type name (type1 arg1,type2 arg2,type3 a
+ _syscall_return(type); \
+ }
+
+-#endif /* __LIBRARY__ && __GNUC__ */
++#endif /* __GNUC__ */
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -578,7 +579,6 @@ #define __ARCH_WANT_SYS_GETPGRP
+ #define __ARCH_WANT_SYS_OLD_GETRLIMIT
+ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -661,4 +661,5 @@ #endif /* __KERNEL_SYSCALLS__ */
+
+ #define cond_syscall(x) asm(".weak\t" #x "\n" #x " = sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _ALPHA_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-arm/unistd.h
++++ b/include/asm-arm/unistd.h
+@@ -13,8 +13,6 @@
+ #ifndef __ASM_ARM_UNISTD_H
+ #define __ASM_ARM_UNISTD_H
+
+-#include <linux/linkage.h>
+-
+ #define __NR_OABI_SYSCALL_BASE 0x900000
+
+ #if defined(__thumb__) || defined(__ARM_EABI__)
+@@ -378,6 +376,9 @@ #undef __NR_syscall
+ #undef __NR_ipc
+ #endif
+
++#ifdef __KERNEL__
++#include <linux/linkage.h>
++
+ #define __sys2(x) #x
+ #define __sys1(x) __sys2(x)
+
+@@ -519,7 +520,6 @@ type name(type1 arg1, type2 arg2, type3
+ __syscall_return(type,__res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_GETHOSTNAME
+@@ -540,7 +540,6 @@ #define __ARCH_WANT_SYS_OLD_GETRLIMIT
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_SYS_SOCKETCALL
+ #endif
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -564,7 +563,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -574,4 +573,5 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-arm26/unistd.h
++++ b/include/asm-arm26/unistd.h
+@@ -14,8 +14,6 @@
+ #ifndef __ASM_ARM_UNISTD_H
+ #define __ASM_ARM_UNISTD_H
+
+-#include <linux/linkage.h>
+-
+ #define __NR_SYSCALL_BASE 0x900000
+
+ /*
+@@ -312,6 +310,9 @@ #define __ARM_NR_breakpoint (__ARM_NR_B
+ #define __ARM_NR_cacheflush (__ARM_NR_BASE+2)
+ #define __ARM_NR_usr26 (__ARM_NR_BASE+3)
+
++#ifdef __KERNEL__
++#include <linux/linkage.h>
++
+ #define __sys2(x) #x
+ #define __sys1(x) __sys2(x)
+
+@@ -443,7 +444,6 @@ type name(type1 arg1, type2 arg2, type3
+ __syscall_return(type,__res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -462,7 +462,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -486,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -496,4 +495,5 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-cris/unistd.h
++++ b/include/asm-cris/unistd.h
+@@ -295,11 +295,11 @@ #define __NR_add_key 286
+ #define __NR_request_key 287
+ #define __NR_keyctl 288
+
+-#define NR_syscalls 289
++#ifdef __KERNEL__
+
++#define NR_syscalls 289
+
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -379,12 +379,10 @@ asmlinkage long sys_rt_sigaction(int sig
+ * complaints. We don't want to use -fno-builtin, so just use a
+ * different name when in the kernel.
+ */
+-#ifdef __KERNEL__
+ #define _exit kernel_syscall_exit
+-#endif
+ static inline _syscall1(int,_exit,int,exitcode)
+ static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+
+ /*
+@@ -395,4 +393,5 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_CRIS_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-frv/unistd.h
++++ b/include/asm-frv/unistd.h
+@@ -317,6 +317,8 @@ #define __NR_faccessat 307
+ #define __NR_pselect6 308
+ #define __NR_ppoll 309
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 310
+
+ /*
+@@ -477,9 +479,8 @@ static inline pid_t wait(int * wait_stat
+ return waitpid(-1,wait_stat,0);
+ }
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ /* #define __ARCH_WANT_OLD_READDIR */
+ #define __ARCH_WANT_OLD_STAT
+@@ -503,7 +504,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+-#endif
+
+ /*
+ * "Conditional" syscalls
+@@ -515,4 +515,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-h8300/unistd.h
++++ b/include/asm-h8300/unistd.h
+@@ -292,6 +292,8 @@ #define __NR_add_key 286
+ #define __NR_request_key 287
+ #define __NR_keyctl 288
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 289
+
+
+@@ -460,7 +462,6 @@ type name(atype a, btype b, ctype c, dty
+ __syscall_return(type, __res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -483,7 +484,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -534,7 +534,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -543,4 +543,5 @@ #define cond_syscall(name) \
+ asm (".weak\t_" #name "\n" \
+ ".set\t_" #name ",_sys_ni_syscall");
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_H8300_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-i386/unistd.h
++++ b/include/asm-i386/unistd.h
+@@ -323,6 +323,8 @@ #define __NR_sync_file_range 314
+ #define __NR_tee 315
+ #define __NR_vmsplice 316
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 317
+
+ /*
+@@ -422,7 +424,6 @@ __asm__ volatile ("push %%ebp ; push %%e
+ __syscall_return(type,__res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -446,7 +447,6 @@ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -485,7 +485,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -497,4 +497,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_I386_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-m32r/unistd.h
++++ b/include/asm-m32r/unistd.h
+@@ -295,6 +295,8 @@ #define __NR_mq_getsetattr (__NR_mq_open
+ #define __NR_kexec_load 283
+ #define __NR_waitid 284
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 285
+
+ /* user-visible error numbers are in the range -1 - -124: see
+@@ -405,7 +407,6 @@ __asm__ __volatile__ (\
+ __syscall_return(type,__res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_ALARM
+@@ -421,7 +422,6 @@ #define __ARCH_WANT_SYS_LLSEEK
+ #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/
+ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -470,4 +470,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M32R_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-m68k/unistd.h
++++ b/include/asm-m68k/unistd.h
+@@ -285,6 +285,8 @@ #define __NR_add_key 279
+ #define __NR_request_key 280
+ #define __NR_keyctl 281
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 282
+
+ /* user-visible error numbers are in the range -1 - -124: see
+@@ -383,7 +385,6 @@ __asm__ __volatile__ ("trap #0" \
+ __syscall_return(type,__res); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -406,7 +407,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -451,7 +451,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -461,4 +461,5 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M68K_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-m68knommu/unistd.h
++++ b/include/asm-m68knommu/unistd.h
+@@ -286,6 +286,8 @@ #define __NR_add_key 279
+ #define __NR_request_key 280
+ #define __NR_keyctl 281
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 282
+
+ /* user-visible error numbers are in the range -1 - -122: see
+@@ -437,7 +439,6 @@ type name(atype a, btype b, ctype c, dty
+ return (type)__res; \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -460,7 +461,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -515,7 +515,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -525,4 +525,5 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M68K_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-parisc/unistd.h
++++ b/include/asm-parisc/unistd.h
+@@ -792,6 +792,7 @@ #define __NR_Linux_syscalls 294
+ #define HPUX_GATEWAY_ADDR 0xC0000004
+ #define LINUX_GATEWAY_ADDR 0x100
+
++#ifdef __KERNEL__
+ #ifndef __ASSEMBLY__
+
+ #define SYS_ify(syscall_name) __NR_##syscall_name
+@@ -934,7 +935,6 @@ type name(type1 arg1, type2 arg2, type3
+ return K_INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_ALARM
+@@ -956,7 +956,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ /* mmap & mmap2 take 6 arguments */
+ #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
+@@ -1056,4 +1055,5 @@ #undef STR
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_PARISC_UNISTD_H_ */
+only in patch2:
+unchanged:
+--- a/include/asm-sh/unistd.h
++++ b/include/asm-sh/unistd.h
+@@ -304,6 +304,8 @@ #define __NR_inotify_rm_watch 292
+
+ #define NR_syscalls 293
+
++#ifdef __KERNEL__
++
+ /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */
+
+ #define __syscall_return(type, res) \
+@@ -420,7 +422,6 @@ __asm__ __volatile__ ("trapa #0x16" \
+ __syscall_return(type,__sc0); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -443,7 +444,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -513,7 +513,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -525,4 +525,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+
++#endif /* __KERNEL__ */
+ #endif /* __ASM_SH_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-sh64/unistd.h
++++ b/include/asm-sh64/unistd.h
+@@ -344,6 +344,8 @@ #define __NR_inotify_init 318
+ #define __NR_inotify_add_watch 319
+ #define __NR_inotify_rm_watch 320
+
++#ifdef __KERNEL__
++
+ #define NR_syscalls 321
+
+ /* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */
+@@ -486,7 +488,6 @@ __asm__ __volatile__ ("!dummy %0 %1 %2 %
+ __syscall_return(type,__sc0); \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+@@ -509,7 +510,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -550,7 +550,7 @@ static inline pid_t wait(int * wait_stat
+ {
+ return waitpid(-1,wait_stat,0);
+ }
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -562,4 +562,5 @@ #ifndef cond_syscall
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif
+
++#endif /* __KERNEL__ */
+ #endif /* __ASM_SH64_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-sparc/unistd.h
++++ b/include/asm-sparc/unistd.h
+@@ -317,6 +317,7 @@ #define __NR_pselect6 297
+ #define __NR_ppoll 298
+ #define __NR_unshare 299
+
++#ifdef __KERNEL__
+ /* WARNING: You MAY NOT add syscall numbers larger than 299, since
+ * all of the syscall tables in the Sparc kernel are
+ * sized to have 299 entries (starting at zero). Therefore
+@@ -453,7 +454,6 @@ errno = -__res; \
+ return -1; \
+ }
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -475,7 +475,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -532,4 +531,5 @@ #endif /* __KERNEL_SYSCALLS__ */
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _SPARC_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-sparc64/unistd.h
++++ b/include/asm-sparc64/unistd.h
+@@ -319,6 +319,7 @@ #define __NR_pselect6 297
+ #define __NR_ppoll 298
+ #define __NR_unshare 299
+
++#ifdef __KERNEL__
+ /* WARNING: You MAY NOT add syscall numbers larger than 299, since
+ * all of the syscall tables in the Sparc kernel are
+ * sized to have 299 entries (starting at zero). Therefore
+@@ -485,7 +486,6 @@ asmlinkage long sys_rt_sigaction(int sig
+
+ #endif /* __KERNEL_SYSCALLS__ */
+
+-#ifdef __KERNEL__
+ /* sysconf options, for SunOS compatibility */
+ #define _SC_ARG_MAX 1
+ #define _SC_CHILD_MAX 2
+@@ -519,7 +519,6 @@ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+ #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+-#endif
+
+ /*
+ * "Conditional" syscalls
+@@ -529,4 +528,5 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif /* _SPARC64_UNISTD_H */
+only in patch2:
+unchanged:
+--- a/include/asm-v850/unistd.h
++++ b/include/asm-v850/unistd.h
+@@ -14,8 +14,6 @@
+ #ifndef __V850_UNISTD_H__
+ #define __V850_UNISTD_H__
+
+-#include <asm/clinkage.h>
+-
+ #define __NR_restart_syscall 0
+ #define __NR_exit 1
+ #define __NR_fork 2
+@@ -237,10 +235,9 @@ #define SYSCALL_CLOBBERS "r1", "r5", "r1
+ except the syscall number (r12). */
+ #define SYSCALL_SHORT_CLOBBERS SYSCALL_CLOBBERS, "r13", "r14"
+
++#ifdef __KERNEL__
+
+-/* User programs sometimes end up including this header file
+- (indirectly, via uClibc header files), so I'm a bit nervous just
+- including <linux/compiler.h>. */
++#include <asm/clinkage.h>
+
+ #define __syscall_return(type, res) \
+ do { \
+@@ -368,7 +365,6 @@ type name (atype a, btype b, ctype c, dt
+ }
+
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_STAT64
+@@ -389,7 +385,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
+@@ -440,7 +435,7 @@ asmlinkage long sys_rt_sigaction(int sig
+ struct sigaction __user *oact,
+ size_t sigsetsize);
+
+-#endif
++#endif /* __KERNEL_SYSCALLS__ */
+
+ /*
+ * "Conditional" syscalls
+@@ -455,4 +450,5 @@ #define cond_syscall(name) \
+ void name (void) __attribute__ ((weak, alias ("sys_ni_syscall")));
+ #endif
+
++#endif /* __KERNEL__ */
+ #endif /* __V850_UNISTD_H__ */
+only in patch2:
+unchanged:
+--- a/include/asm-x86_64/unistd.h
++++ b/include/asm-x86_64/unistd.h
+@@ -618,6 +618,8 @@ __SYSCALL(__NR_sync_file_range, sys_sync
+ #define __NR_vmsplice 278
+ __SYSCALL(__NR_vmsplice, sys_vmsplice)
+
++#ifdef __KERNEL__
++
+ #define __NR_syscall_max __NR_vmsplice
+
+ #ifndef __NO_STUBS
+@@ -635,7 +637,6 @@ do { \
+ return (type) (res); \
+ } while (0)
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+ #define __ARCH_WANT_SYS_ALARM
+@@ -657,7 +658,6 @@ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ #define __ARCH_WANT_SYS_TIME
+ #define __ARCH_WANT_COMPAT_SYS_TIME
+-#endif
+
+ #ifndef __KERNEL_SYSCALLS__
+
+@@ -821,7 +821,7 @@ asmlinkage long sys_pipe(int *fildes);
+
+ #endif /* __KERNEL_SYSCALLS__ */
+
+-#if !defined(__ASSEMBLY__) && defined(__KERNEL__)
++#ifndef __ASSEMBLY__
+
+ #include <linux/linkage.h>
+ #include <linux/compiler.h>
+@@ -848,4 +848,5 @@ #endif /* __NO_STUBS */
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+
++#endif /* __KERNEL__ */
+ #endif
+only in patch2:
+unchanged:
+--- a/include/asm-xtensa/unistd.h
++++ b/include/asm-xtensa/unistd.h
+@@ -11,8 +11,6 @@
+ #ifndef _XTENSA_UNISTD_H
+ #define _XTENSA_UNISTD_H
+
+-#include <linux/linkage.h>
+-
+ #define __NR_spill 0
+ #define __NR_exit 1
+ #define __NR_read 3
+@@ -221,21 +219,9 @@ #define SYSXTENSA_ATOMIC_CMP_SWP 4 /*
+ #define SYSXTENSA_COUNT 5 /* count of syscall0 functions*/
+
+ #ifdef __KERNEL__
+-#define __syscall_return(type, res) return ((type)(res))
+-#else
+-#define __syscall_return(type, res) \
+-do { \
+- if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+- /* Avoid using "res" which is declared to be in register r2; \
+- * errno might expand to a function call and clobber it. */ \
+- int __err = -(res); \
+- errno = __err; \
+- res = -1; \
+- } \
+- return (type) (res); \
+-} while (0)
+-#endif
++#include <linux/linkage.h>
+
++#define __syscall_return(type, res) return ((type)(res))
+
+ /* Tensilica's xt-xcc compiler is much more agressive at code
+ * optimization than gcc. Multiple __asm__ statements are
+@@ -429,11 +415,10 @@ #endif
+ */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
+-#ifdef __KERNEL__
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_UTIME
+ #define __ARCH_WANT_SYS_LLSEEK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
++#endif /* __KERNEL__ */
+
+ #endif /* _XTENSA_UNISTD_H */
More information about the fedora-cvs-commits
mailing list