rpms/kernel/devel kernel-2.6.spec, 1.2164, 1.2165 linux-2.6-header-cleanup-git.patch, 1.1, 1.2 linux-2.6-header-install-git.patch, 1.2, 1.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 26 23:46:22 UTC 2006


Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20649

Modified Files:
	kernel-2.6.spec linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
Log Message:
this kernel-headers should work


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2164
retrieving revision 1.2165
diff -u -r1.2164 -r1.2165
--- kernel-2.6.spec	26 Apr 2006 20:53:21 -0000	1.2164
+++ kernel-2.6.spec	26 Apr 2006 23:46:20 -0000	1.2165
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 
@@ -749,11 +749,6 @@
 %patch1 -p1
 %patch2 -p1
 
-%if %{buildheaders}
-%patch50 -p1
-%patch51 -p1
-%endif
-
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
 #
@@ -1054,6 +1049,11 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# Put these last for now, so they don't conflict with other people's patches
+%if %{buildheaders}
+%patch50 -p1
+%patch51 -p1
+%endif
 
 # END OF PATCH APPLICATIONS
 
@@ -1364,6 +1364,8 @@
 %if %{buildheaders}
 # Install kernel headers
 make INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
+# glibc provides scsi headers for itself, for now
+rm -rf $RPM_BUILD_ROOT/usr/include/scsi
 %endif
 ###
 ### clean
@@ -1706,6 +1708,11 @@
 %endif
 
 %changelog
+* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com>
+- Don't include /usr/include/scsi in kernel-headers for now, because
+  glibc ships those for itself. Update header cleanup patches so that
+  glibc actually builds against the resulting headers
+
 * Wed Apr 26 2006 Juan Quintela <quintela at redhat.com>
 - Delete figlet form xen hypervisor.
 

linux-2.6-header-cleanup-git.patch:
 acpi/platform/aclinux.h                      |    1 
 acpi/processor.h                             |    1 
 asm-alpha/bitops.h                           |    1 
 asm-alpha/cache.h                            |    1 
 asm-alpha/cacheflush.h                       |    1 
 asm-alpha/core_cia.h                         |    1 
 asm-alpha/core_t2.h                          |    1 
 asm-alpha/dma-mapping.h                      |    1 
 asm-alpha/dma.h                              |    1 
 asm-alpha/floppy.h                           |    1 
 asm-alpha/hardirq.h                          |    1 
 asm-alpha/hw_irq.h                           |    1 
 asm-alpha/ide.h                              |    1 
 asm-alpha/io.h                               |    1 
 asm-alpha/irq.h                              |    1 
 asm-alpha/kmap_types.h                       |    1 
 asm-alpha/machvec.h                          |    1 
 asm-alpha/mmu_context.h                      |    1 
 asm-alpha/mmzone.h                           |    1 
 asm-alpha/page.h                             |    1 
 asm-alpha/param.h                            |    1 
 asm-alpha/pgalloc.h                          |    1 
 asm-alpha/pgtable.h                          |    1 
 asm-alpha/serial.h                           |    1 
 asm-alpha/smp.h                              |    1 
 asm-alpha/spinlock.h                         |    1 
 asm-alpha/system.h                           |    1 
 asm-alpha/tlbflush.h                         |    1 
 asm-arm/apm.h                                |    1 
 asm-arm/arch-aaec2000/memory.h               |    1 
 asm-arm/arch-cl7500/acornfb.h                |    1 
 asm-arm/arch-clps711x/hardware.h             |    1 
 asm-arm/arch-clps711x/memory.h               |    1 
 asm-arm/arch-clps711x/uncompress.h           |    1 
 asm-arm/arch-ebsa285/hardware.h              |    1 
 asm-arm/arch-ebsa285/memory.h                |    1 
 asm-arm/arch-ebsa285/vmalloc.h               |    1 
 asm-arm/arch-integrator/smp.h                |    1 
 asm-arm/arch-iop3xx/memory.h                 |    1 
 asm-arm/arch-iop3xx/timex.h                  |    1 
 asm-arm/arch-iop3xx/uncompress.h             |    1 
 asm-arm/arch-ixp4xx/dma.h                    |    1 
 asm-arm/arch-lh7a40x/constants.h             |    1 
 asm-arm/arch-lh7a40x/irqs.h                  |    1 
 asm-arm/arch-lh7a40x/registers.h             |    1 
 asm-arm/arch-omap/board.h                    |    1 
 asm-arm/arch-omap/hardware.h                 |    1 
 asm-arm/arch-omap/system.h                   |    1 
 asm-arm/arch-omap/uncompress.h               |    1 
 asm-arm/arch-pxa/idp.h                       |    1 
 asm-arm/arch-pxa/irqs.h                      |    1 
 asm-arm/arch-pxa/pxa-regs.h                  |    1 
 asm-arm/arch-pxa/timex.h                     |    1 
 asm-arm/arch-realview/smp.h                  |    1 
 asm-arm/arch-s3c2410/dma.h                   |    1 
 asm-arm/arch-s3c2410/uncompress.h            |    1 
 asm-arm/arch-sa1100/assabet.h                |    1 
 asm-arm/arch-sa1100/cerf.h                   |    1 
 asm-arm/arch-sa1100/collie.h                 |    1 
 asm-arm/arch-sa1100/dma.h                    |    1 
 asm-arm/arch-sa1100/hardware.h               |    1 
 asm-arm/arch-sa1100/ide.h                    |    1 
 asm-arm/arch-sa1100/irqs.h                   |    1 
 asm-arm/arch-sa1100/memory.h                 |    1 
 asm-arm/arch-sa1100/system.h                 |    1 
 asm-arm/atomic.h                             |    1 
 asm-arm/bug.h                                |    1 
 asm-arm/cacheflush.h                         |    1 
 asm-arm/cpu.h                                |    1 
 asm-arm/dma-mapping.h                        |    1 
 asm-arm/dma.h                                |    1 
 asm-arm/elf.h                                |    1 
 asm-arm/fpstate.h                            |    1 
 asm-arm/glue.h                               |    1 
 asm-arm/hardirq.h                            |    1 
 asm-arm/hardware/dec21285.h                  |    1 
 asm-arm/hardware/iomd.h                      |    1 
 asm-arm/leds.h                               |    1 
 asm-arm/mach/serial_at91rm9200.h             |    1 
 asm-arm/mach/serial_sa1100.h                 |    1 
 asm-arm/memory.h                             |    1 
 asm-arm/page.h                               |    1 
 asm-arm/pci.h                                |    1 
 asm-arm/proc-fns.h                           |    1 
 asm-arm/ptrace.h                             |    1 
 asm-arm/smp.h                                |    1 
 asm-arm/system.h                             |    1 
 asm-arm/tlbflush.h                           |    1 
 asm-arm26/atomic.h                           |    1 
 asm-arm26/bug.h                              |    1 
 asm-arm26/dma.h                              |    1 
 asm-arm26/hardirq.h                          |    1 
 asm-arm26/hardware.h                         |    1 
 asm-arm26/io.h                               |    1 
 asm-arm26/leds.h                             |    1 
 asm-arm26/mach-types.h                       |    1 
 asm-arm26/page.h                             |    1 
 asm-arm26/pgtable.h                          |    1 
 asm-arm26/serial.h                           |    1 
 asm-arm26/smp.h                              |    1 
 asm-arm26/sysirq.h                           |    1 
 asm-arm26/system.h                           |    1 
 asm-cris/arch-v10/io.h                       |    1 
 asm-cris/arch-v10/page.h                     |    1 
 asm-cris/arch-v10/system.h                   |    1 
 asm-cris/arch-v32/io.h                       |    1 
 asm-cris/arch-v32/irq.h                      |    1 
 asm-cris/arch-v32/page.h                     |    1 
 asm-cris/arch-v32/processor.h                |    1 
 asm-cris/arch-v32/system.h                   |    1 
 asm-cris/eshlibld.h                          |    1 
 asm-cris/etraxgpio.h                         |    1 
 asm-cris/fasttimer.h                         |    1 
 asm-cris/page.h                              |    1 
 asm-cris/pci.h                               |    1 
 asm-cris/pgtable.h                           |    1 
 asm-cris/processor.h                         |    1 
 asm-cris/rtc.h                               |    1 
 asm-cris/tlbflush.h                          |    1 
 asm-frv/atomic.h                             |    1 
 asm-frv/bitops.h                             |    1 
 asm-frv/bug.h                                |    1 
 asm-frv/cache.h                              |    1 
 asm-frv/dma.h                                |    1 
 asm-frv/elf.h                                |    1 
 asm-frv/fpu.h                                |    1 
 asm-frv/hardirq.h                            |    1 
 asm-frv/highmem.h                            |    1 
 asm-frv/ide.h                                |    1 
 asm-frv/io.h                                 |    1 
 asm-frv/irq.h                                |    1 
 asm-frv/mmu_context.h                        |    1 
 asm-frv/page.h                               |    1 
 asm-frv/pci.h                                |    1 
 asm-frv/pgalloc.h                            |    1 
 asm-frv/pgtable.h                            |    1 
 asm-frv/processor.h                          |    1 
 asm-frv/segment.h                            |    1 
 asm-frv/serial.h                             |    1 
 asm-frv/smp.h                                |    1 
 asm-frv/system.h                             |    1 
 asm-frv/tlbflush.h                           |    1 
 asm-frv/types.h                              |    1 
 asm-frv/unaligned.h                          |    1 
 asm-frv/virtconvert.h                        |    1 
 asm-generic/bug.h                            |    1 
 asm-generic/dma-mapping.h                    |    1 
 asm-generic/fcntl.h                          |    1 
 asm-generic/local.h                          |    1 
 asm-generic/tlb.h                            |    1 
 asm-h8300/bitops.h                           |    1 
 asm-h8300/dma.h                              |    1 
 asm-h8300/elf.h                              |    1 
 asm-h8300/hardirq.h                          |    1 
 asm-h8300/io.h                               |    1 
 asm-h8300/keyboard.h                         |    1 
 asm-h8300/mmu_context.h                      |    1 
 asm-h8300/page.h                             |    1 
 asm-h8300/page_offset.h                      |    1 
 asm-h8300/param.h                            |    1 
 asm-h8300/pgtable.h                          |    1 
 asm-h8300/processor.h                        |    1 
 asm-h8300/semaphore-helper.h                 |    1 
 asm-h8300/shm.h                              |    1 
 asm-h8300/system.h                           |    1 
 asm-h8300/unaligned.h                        |    1 
 asm-h8300/virtconvert.h                      |    1 
 asm-i386/apic.h                              |    1 
 asm-i386/atomic.h                            |    1 
 asm-i386/bitops.h                            |    1 
 asm-i386/bug.h                               |    1 
 asm-i386/bugs.h                              |    1 
 asm-i386/byteorder.h                         |    1 
 asm-i386/cache.h                             |    1 
 asm-i386/dma.h                               |    1 
 asm-i386/fixmap.h                            |    1 
 asm-i386/hardirq.h                           |    1 
 asm-i386/highmem.h                           |    1 
 asm-i386/hpet.h                              |    1 
 asm-i386/hw_irq.h                            |    1 
 asm-i386/ide.h                               |    1 
 asm-i386/io.h                                |    1 
 asm-i386/io_apic.h                           |    1 
 asm-i386/irq.h                               |    1 
 asm-i386/kmap_types.h                        |    1 
 asm-i386/mach-summit/mach_apic.h             |    1 
 asm-i386/mmu_context.h                       |    1 
 asm-i386/mtrr.h                              |    1 
 asm-i386/page.h                              |    1 
 asm-i386/param.h                             |    1 
 asm-i386/pci.h                               |    1 
 asm-i386/pgalloc.h                           |    1 
 asm-i386/pgtable.h                           |    1 
 asm-i386/processor.h                         |    1 
 asm-i386/serial.h                            |    1 
 asm-i386/smp.h                               |    1 
 asm-i386/spinlock.h                          |    1 
 asm-i386/string.h                            |    1 
 asm-i386/system.h                            |    1 
 asm-i386/thread_info.h                       |    1 
 asm-i386/timex.h                             |    1 
 asm-i386/tlbflush.h                          |    1 
 asm-i386/types.h                             |    1 
 asm-i386/uaccess.h                           |    1 
 asm-ia64/asmmacro.h                          |    1 
 asm-ia64/cache.h                             |    1 
 asm-ia64/delay.h                             |    1 
 asm-ia64/dma-mapping.h                       |    1 
 asm-ia64/dma.h                               |    1 
 asm-ia64/elf.h                               |    1 
 asm-ia64/hardirq.h                           |    1 
 asm-ia64/ia32.h                              |    1 
 asm-ia64/ide.h                               |    1 
 asm-ia64/intrinsics.h                        |    1 
 asm-ia64/kmap_types.h                        |    1 
 asm-ia64/machvec.h                           |    1 
 asm-ia64/meminit.h                           |    1 
 asm-ia64/nodedata.h                          |    1 
 asm-ia64/numa.h                              |    1 
 asm-ia64/page.h                              |    1 
 asm-ia64/param.h                             |    1 
 asm-ia64/percpu.h                            |    1 
 asm-ia64/pgalloc.h                           |    1 
 asm-ia64/pgtable.h                           |    1 
 asm-ia64/processor.h                         |    1 
 asm-ia64/ptrace.h                            |    1 
 asm-ia64/smp.h                               |    1 
 asm-ia64/sn/simulator.h                      |    1 
 asm-ia64/sn/sn_cpuid.h                       |    1 
 asm-ia64/sn/sn_sal.h                         |    1 
 asm-ia64/sn/xpc.h                            |    1 
 asm-ia64/string.h                            |    1 
 asm-ia64/system.h                            |    1 
 asm-ia64/tlb.h                               |    1 
 asm-ia64/tlbflush.h                          |    1 
 asm-ia64/unistd.h                            |    1 
 asm-m32r/assembler.h                         |    1 
 asm-m32r/atomic.h                            |    1 
 asm-m32r/bitops.h                            |    1 
 asm-m32r/cacheflush.h                        |    1 
 asm-m32r/hardirq.h                           |    1 
 asm-m32r/ide.h                               |    1 
 asm-m32r/irq.h                               |    1 
 asm-m32r/kmap_types.h                        |    1 
 asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 asm-m32r/m32r.h                              |    1 
 asm-m32r/mmu.h                               |    1 
 asm-m32r/mmu_context.h                       |    2 
 asm-m32r/opsput/opsput_lan.h                 |    1 
 asm-m32r/opsput/opsput_lcd.h                 |    1 
 asm-m32r/opsput/opsput_pld.h                 |    1 
 asm-m32r/page.h                              |    1 
 asm-m32r/pgalloc.h                           |    1 
 asm-m32r/pgtable-2level.h                    |    1 
 asm-m32r/pgtable.h                           |    1 
 asm-m32r/processor.h                         |    1 
 asm-m32r/ptrace.h                            |    1 
 asm-m32r/rtc.h                               |    1 
 asm-m32r/semaphore.h                         |    1 
 asm-m32r/serial.h                            |    1 
 asm-m32r/sigcontext.h                        |    1 
 asm-m32r/smp.h                               |    1 
 asm-m32r/spinlock.h                          |    1 
 asm-m32r/system.h                            |    1 
 asm-m32r/timex.h                             |    1 
 asm-m32r/tlbflush.h                          |    1 
 asm-m32r/uaccess.h                           |    1 
 asm-m68k/atomic.h                            |    1 
 asm-m68k/bug.h                               |    1 
 asm-m68k/dma-mapping.h                       |    1 
 asm-m68k/dma.h                               |    1 
 asm-m68k/dvma.h                              |    1 
 asm-m68k/elf.h                               |    1 
 asm-m68k/entry.h                             |    1 
 asm-m68k/fpu.h                               |    1 
 asm-m68k/hardirq.h                           |    1 
 asm-m68k/ide.h                               |    1 
 asm-m68k/io.h                                |    1 
 asm-m68k/irq.h                               |    1 
 asm-m68k/mc146818rtc.h                       |    1 
 asm-m68k/mmu_context.h                       |    1 
 asm-m68k/motorola_pgtable.h                  |    1 
 asm-m68k/openprom.h                          |    1 
 asm-m68k/page.h                              |    1 
 asm-m68k/page_offset.h                       |    1 
 asm-m68k/pgalloc.h                           |    1 
 asm-m68k/pgtable.h                           |    1 
 asm-m68k/processor.h                         |    1 
 asm-m68k/semaphore-helper.h                  |    1 
 asm-m68k/serial.h                            |    1 
 asm-m68k/setup.h                             |    1 
 asm-m68k/shm.h                               |    1 
 asm-m68k/system.h                            |    1 
 asm-m68k/tlbflush.h                          |    1 
 asm-m68k/virtconvert.h                       |    1 
 asm-m68knommu/bitops.h                       |    1 
 asm-m68knommu/coldfire.h                     |    1 
 asm-m68knommu/commproc.h                     |    1 
 asm-m68knommu/dma-mapping.h                  |    1 
 asm-m68knommu/dma.h                          |    1 
 asm-m68knommu/elf.h                          |    1 
 asm-m68knommu/elia.h                         |    1 
 asm-m68knommu/entry.h                        |    1 
 asm-m68knommu/fpu.h                          |    1 
 asm-m68knommu/hardirq.h                      |    1 
 asm-m68knommu/io.h                           |    1 
 asm-m68knommu/irq.h                          |    1 
 asm-m68knommu/m5206sim.h                     |    1 
 asm-m68knommu/m520xsim.h                     |    1 
 asm-m68knommu/m523xsim.h                     |    1 
 asm-m68knommu/m5272sim.h                     |    1 
 asm-m68knommu/m527xsim.h                     |    1 
 asm-m68knommu/m528xsim.h                     |    1 
 asm-m68knommu/mcfcache.h                     |    1 
 asm-m68knommu/mcfdma.h                       |    1 
 asm-m68knommu/mcfmbus.h                      |    1 
 asm-m68knommu/mcfne.h                        |    1 
 asm-m68knommu/mcfpci.h                       |    1 
 asm-m68knommu/mcfpit.h                       |    1 
 asm-m68knommu/mcfsim.h                       |    1 
 asm-m68knommu/mcfsmc.h                       |    1 
 asm-m68knommu/mcftimer.h                     |    1 
 asm-m68knommu/mcfuart.h                      |    1 
 asm-m68knommu/mcfwdebug.h                    |    1 
 asm-m68knommu/mmu_context.h                  |    1 
 asm-m68knommu/nettel.h                       |    1 
 asm-m68knommu/page.h                         |    1 
 asm-m68knommu/page_offset.h                  |    1 
 asm-m68knommu/param.h                        |    1 
 asm-m68knommu/pgtable.h                      |    1 
 asm-m68knommu/processor.h                    |    1 
 asm-m68knommu/semaphore-helper.h             |    1 
 asm-m68knommu/system.h                       |    1 
 asm-m68knommu/unaligned.h                    |    1 
 asm-mips/a.out.h                             |    1 
 asm-mips/addrspace.h                         |    1 
 asm-mips/arc/types.h                         |    1 
 asm-mips/asm.h                               |    1 
 asm-mips/asmmacro.h                          |    1 
 asm-mips/atomic.h                            |    1 
 asm-mips/bcache.h                            |    1 
 asm-mips/bitops.h                            |    1 
 asm-mips/bug.h                               |    1 
 asm-mips/bugs.h                              |    1 
 asm-mips/byteorder.h                         |    1 
 asm-mips/cache.h                             |    1 
 asm-mips/checksum.h                          |    1 
 asm-mips/cpu-features.h                      |    1 
 asm-mips/cpu-info.h                          |    1 
 asm-mips/ddb5xxx/ddb5477.h                   |    1 
 asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 asm-mips/debug.h                             |    1 
 asm-mips/dec/prom.h                          |    1 
 asm-mips/delay.h                             |    1 
 asm-mips/dma.h                               |    1 
 asm-mips/elf.h                               |    1 
 asm-mips/fcntl.h                             |    1 
 asm-mips/fixmap.h                            |    1 
 asm-mips/fpu.h                               |    1 
 asm-mips/futex.h                             |    1 
 asm-mips/hazards.h                           |    1 
 asm-mips/highmem.h                           |    1 
 asm-mips/interrupt.h                         |    1 
 asm-mips/io.h                                |    1 
 asm-mips/ip32/machine.h                      |    1 
 asm-mips/irq.h                               |    1 
 asm-mips/isadep.h                            |    1 
 asm-mips/jmr3927/irq.h                       |    1 
 asm-mips/kmap_types.h                        |    1 
 asm-mips/local.h                             |    1 
 asm-mips/mach-au1x00/au1000.h                |    1 
 asm-mips/mach-au1x00/au1xxx.h                |    1 
 asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 asm-mips/mach-au1x00/ioremap.h               |    1 
 asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 asm-mips/mach-db1x00/db1x00.h                |    1 
 asm-mips/mach-generic/ide.h                  |    1 
 asm-mips/mach-generic/kmalloc.h              |    1 
 asm-mips/mach-generic/spaces.h               |    1 
 asm-mips/mach-ip22/spaces.h                  |    1 
 asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 asm-mips/mach-ip32/kmalloc.h                 |    1 
 asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 asm-mips/mach-mips/irq.h                     |    1 
 asm-mips/mach-pb1x00/pb1550.h                |    1 
 asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 asm-mips/mips-boards/generic.h               |    1 
 asm-mips/mipsregs.h                          |    1 
 asm-mips/mmu_context.h                       |    1 
 asm-mips/mmzone.h                            |    1 
 asm-mips/module.h                            |    1 
 asm-mips/msgbuf.h                            |    1 
 asm-mips/paccess.h                           |    1 
 asm-mips/page.h                              |    1 
 asm-mips/pci.h                               |    1 
 asm-mips/pgalloc.h                           |    1 
 asm-mips/pgtable-32.h                        |    1 
 asm-mips/pgtable-64.h                        |    1 
 asm-mips/pgtable-bits.h                      |    1 
 asm-mips/pgtable.h                           |    1 
 asm-mips/prefetch.h                          |    1 
 asm-mips/processor.h                         |    1 
 asm-mips/ptrace.h                            |    1 
 asm-mips/reg.h                               |    1 
 asm-mips/resource.h                          |    1 
 asm-mips/serial.h                            |    1 
 asm-mips/sgiarcs.h                           |    1 
 asm-mips/sibyte/board.h                      |    1 
 asm-mips/sibyte/carmel.h                     |    1 
 asm-mips/sibyte/sentosa.h                    |    1 
 asm-mips/sibyte/swarm.h                      |    1 
 asm-mips/siginfo.h                           |    1 
 asm-mips/signal.h                            |    1 
 asm-mips/sim.h                               |    1 
 asm-mips/smp.h                               |    1 
 asm-mips/sn/addrs.h                          |    1 
 asm-mips/sn/agent.h                          |    1 
 asm-mips/sn/arch.h                           |    1 
 asm-mips/sn/io.h                             |    1 
 asm-mips/sn/klconfig.h                       |    1 
 asm-mips/sn/kldir.h                          |    1 
 asm-mips/sn/launch.h                         |    1 
 asm-mips/sn/mapped_kernel.h                  |    1 
 asm-mips/sn/sn0/addrs.h                      |    1 
 asm-mips/sn/sn0/arch.h                       |    1 
 asm-mips/sn/sn0/hubmd.h                      |    1 
 asm-mips/stackframe.h                        |    1 
 asm-mips/string.h                            |    1 
 asm-mips/system.h                            |    1 
 asm-mips/thread_info.h                       |    1 
 asm-mips/tlbflush.h                          |    1 
 asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 asm-mips/types.h                             |    1 
 asm-mips/uaccess.h                           |    1 
 asm-mips/unistd.h                            |    1 
 asm-mips/vr41xx/vrc4173.h                    |    1 
 asm-mips/war.h                               |    1 
 asm-mips/wbflush.h                           |    1 
 asm-parisc/atomic.h                          |    1 
 asm-parisc/cache.h                           |    1 
 asm-parisc/cacheflush.h                      |    1 
 asm-parisc/dma-mapping.h                     |    1 
 asm-parisc/dma.h                             |    1 
 asm-parisc/io.h                              |    1 
 asm-parisc/irq.h                             |    1 
 asm-parisc/kmap_types.h                      |    1 
 asm-parisc/page.h                            |    1 
 asm-parisc/param.h                           |    1 
 asm-parisc/pci.h                             |    1 
 asm-parisc/pdc.h                             |    1 
 asm-parisc/pgtable.h                         |    1 
 asm-parisc/processor.h                       |    1 
 asm-parisc/psw.h                             |    1 
 asm-parisc/smp.h                             |    1 
 asm-parisc/system.h                          |    1 
 asm-parisc/tlbflush.h                        |    1 
 asm-powerpc/abs_addr.h                       |    1 
 asm-powerpc/cache.h                          |    1 
 asm-powerpc/dma-mapping.h                    |    1 
 asm-powerpc/dma.h                            |    1 
 asm-powerpc/eeh.h                            |    1 
 asm-powerpc/elf.h                            |    7 --
 asm-powerpc/floppy.h                         |    1 
 asm-powerpc/hw_irq.h                         |    1 
 asm-powerpc/ide.h                            |    1 
 asm-powerpc/iommu.h                          |    1 
 asm-powerpc/irq.h                            |    1 
 asm-powerpc/iseries/iseries_io.h             |    1 
 asm-powerpc/machdep.h                        |    1 
 asm-powerpc/mmzone.h                         |    1 
 asm-powerpc/paca.h                           |    1 
 asm-powerpc/page.h                           |    1 
 asm-powerpc/pgtable.h                        |    1 
 asm-powerpc/ppc_asm.h                        |    1 
 asm-powerpc/prom.h                           |    1 
 asm-powerpc/smp.h                            |    1 
 asm-powerpc/smu.h                            |    1 
 asm-powerpc/spu.h                            |    1 
 asm-powerpc/thread_info.h                    |    1 
 asm-powerpc/time.h                           |    1 
 asm-powerpc/timex.h                          |    1 
 asm-powerpc/tlb.h                            |    1 
 asm-powerpc/tlbflush.h                       |    1 
 asm-powerpc/topology.h                       |    1 
 asm-powerpc/types.h                          |    1 
 asm-powerpc/unistd.h                         |    1 
 asm-powerpc/vga.h                            |    1 
 asm-powerpc/vio.h                            |    1 
 asm-ppc/amigahw.h                            |    1 
 asm-ppc/bootinfo.h                           |    1 
 asm-ppc/commproc.h                           |    1 
 asm-ppc/ibm403.h                             |    1 
 asm-ppc/ibm44x.h                             |    1 
 asm-ppc/ibm4xx.h                             |    1 
 asm-ppc/io.h                                 |    1 
 asm-ppc/machdep.h                            |    1 
 asm-ppc/mmu.h                                |    1 
 asm-ppc/mmu_context.h                        |    1 
 asm-ppc/mpc8260.h                            |    1 
 asm-ppc/mpc83xx.h                            |    1 
 asm-ppc/mpc85xx.h                            |    1 
 asm-ppc/mpc8xx.h                             |    1 
 asm-ppc/mv64x60.h                            |    1 
 asm-ppc/ocp.h                                |    1 
 asm-ppc/open_pic.h                           |    1 
 asm-ppc/page.h                               |    2 
 asm-ppc/pc_serial.h                          |    1 
 asm-ppc/pgalloc.h                            |    1 
 asm-ppc/pgtable.h                            |    1 
 asm-ppc/ppc4xx_dma.h                         |    1 
 asm-ppc/ppc4xx_pic.h                         |    1 
 asm-ppc/serial.h                             |    1 
 asm-ppc/smp.h                                |    1 
 asm-ppc/time.h                               |    1 
 asm-s390/bitops.h                            |    1 
 asm-s390/debug.h                             |    1 
 asm-s390/hardirq.h                           |    1 
 asm-s390/idals.h                             |    1 
 asm-s390/local.h                             |    1 
 asm-s390/lowcore.h                           |    1 
 asm-s390/pgalloc.h                           |    1 
 asm-s390/ptrace.h                            |    1 
 asm-s390/sfp-machine.h                       |    1 
 asm-s390/smp.h                               |    1 
 asm-s390/system.h                            |    1 
 asm-s390/tlbflush.h                          |    1 
 asm-s390/types.h                             |    1 
 asm-s390/unistd.h                            |    1 
 asm-sh/bug.h                                 |    1 
 asm-sh/checksum.h                            |    1 
 asm-sh/dma-mapping.h                         |    1 
 asm-sh/dma.h                                 |    1 
 asm-sh/fixmap.h                              |    1 
 asm-sh/hardirq.h                             |    1 
 asm-sh/hd64461/hd64461.h                     |    1 
 asm-sh/hd64465/hd64465.h                     |    1 
 asm-sh/ide.h                                 |    1 
 asm-sh/io.h                                  |    1 
 asm-sh/irq.h                                 |    1 
 asm-sh/keyboard.h                            |    1 
 asm-sh/kmap_types.h                          |    1 
 asm-sh/machvec.h                             |    1 
 asm-sh/machvec_init.h                        |    1 
 asm-sh/mpc1211/dma.h                         |    1 
 asm-sh/overdrive/overdrive.h                 |    1 
 asm-sh/page.h                                |    1 
 asm-sh/pgtable.h                             |    1 
 asm-sh/serial.h                              |    1 
 asm-sh/smp.h                                 |    1 
 asm-sh/system.h                              |    1 
 asm-sh/types.h                               |    1 
 asm-sh/watchdog.h                            |    1 
 asm-sh64/bug.h                               |    1 
 asm-sh64/dma-mapping.h                       |    1 
 asm-sh64/hardirq.h                           |    1 
 asm-sh64/ide.h                               |    1 
 asm-sh64/irq.h                               |    1 
 asm-sh64/mmu_context.h                       |    1 
 asm-sh64/page.h                              |    1 
 asm-sh64/param.h                             |    1 
 asm-sh64/pgtable.h                           |    1 
 asm-sh64/system.h                            |    1 
 asm-sparc/asmmacro.h                         |    1 
 asm-sparc/atomic.h                           |    1 
 asm-sparc/bugs.h                             |    1 
 asm-sparc/cacheflush.h                       |    1 
 asm-sparc/delay.h                            |    1 
 asm-sparc/dma-mapping.h                      |    1 
 asm-sparc/dma.h                              |    1 
 asm-sparc/elf.h                              |    1 
 asm-sparc/fixmap.h                           |    1 
 asm-sparc/hardirq.h                          |    1 
 asm-sparc/ide.h                              |    1 
 asm-sparc/irq.h                              |    1 
 asm-sparc/mostek.h                           |    1 
 asm-sparc/page.h                             |    1 
 asm-sparc/pgalloc.h                          |    1 
 asm-sparc/pgtable.h                          |    1 
 asm-sparc/sfp-machine.h                      |    1 
 asm-sparc/smp.h                              |    1 
 asm-sparc/system.h                           |    2 
 asm-sparc/timer.h                            |    1 
 asm-sparc/tlbflush.h                         |    1 
 asm-sparc/vac-ops.h                          |    1 
 asm-sparc/winmacro.h                         |    1 
 asm-sparc64/atomic.h                         |    1 
 asm-sparc64/bitops.h                         |    1 
 asm-sparc64/bugs.h                           |    1 
 asm-sparc64/cacheflush.h                     |    1 
 asm-sparc64/delay.h                          |    1 
 asm-sparc64/dma-mapping.h                    |    1 
 asm-sparc64/dma.h                            |    1 
 asm-sparc64/floppy.h                         |    1 
 asm-sparc64/ide.h                            |    1 
 asm-sparc64/irq.h                            |    1 
 asm-sparc64/kprobes.h                        |    1 
 asm-sparc64/mc146818rtc.h                    |    1 
 asm-sparc64/mmu.h                            |    1 
 asm-sparc64/oplib.h                          |    1 
 asm-sparc64/page.h                           |    1 
 asm-sparc64/param.h                          |    1 
 asm-sparc64/pgalloc.h                        |    1 
 asm-sparc64/pgtable.h                        |    1 
 asm-sparc64/processor.h                      |    1 
 asm-sparc64/siginfo.h                        |    1 
 asm-sparc64/signal.h                         |    1 
 asm-sparc64/smp.h                            |    1 
 asm-sparc64/spinlock.h                       |    1 
 asm-sparc64/system.h                         |    1 
 asm-sparc64/timer.h                          |    1 
 asm-sparc64/tlb.h                            |    1 
 asm-sparc64/tlbflush.h                       |    1 
 asm-sparc64/ttable.h                         |    1 
 asm-um/a.out.h                               |    1 
 asm-um/cache.h                               |    1 
 asm-um/elf-ppc.h                             |    1 
 asm-um/fixmap.h                              |    1 
 asm-um/hardirq.h                             |    1 
 asm-um/linkage.h                             |    1 
 asm-um/mmu_context.h                         |    1 
 asm-um/page.h                                |    1 
 asm-um/pgalloc.h                             |    1 
 asm-um/processor-generic.h                   |    1 
 asm-um/ptrace-generic.h                      |    1 
 asm-um/smp.h                                 |    1 
 asm-um/thread_info.h                         |    1 
 asm-v850/atomic.h                            |    1 
 asm-v850/bitops.h                            |    1 
 asm-v850/dma-mapping.h                       |    1 
 asm-v850/hardirq.h                           |    1 
 asm-v850/machdep.h                           |    1 
 asm-v850/pgtable.h                           |    1 
 asm-v850/processor.h                         |    1 
 asm-v850/serial.h                            |    1 
 asm-v850/v850e_uart.h                        |    1 
 asm-x86_64/apic.h                            |    1 
 asm-x86_64/atomic.h                          |    1 
 asm-x86_64/bitops.h                          |    1 
 asm-x86_64/bugs.h                            |    1 
 asm-x86_64/cache.h                           |    1 
 asm-x86_64/calling.h                         |    1 
 asm-x86_64/dma-mapping.h                     |    1 
 asm-x86_64/dma.h                             |    1 
 asm-x86_64/dwarf2.h                          |    1 
 asm-x86_64/fixmap.h                          |    1 
 asm-x86_64/hardirq.h                         |    1 
 asm-x86_64/hw_irq.h                          |    1 
 asm-x86_64/ia32.h                            |    1 
 asm-x86_64/io.h                              |    1 
 asm-x86_64/io_apic.h                         |    1 
 asm-x86_64/mmu_context.h                     |    1 
 asm-x86_64/mmzone.h                          |    1 
 asm-x86_64/mtrr.h                            |    1 
 asm-x86_64/page.h                            |    1 
 asm-x86_64/param.h                           |    1 
 asm-x86_64/pci.h                             |    1 
 asm-x86_64/processor.h                       |    1 
 asm-x86_64/serial.h                          |    1 
 asm-x86_64/smp.h                             |    1 
 asm-x86_64/spinlock.h                        |    1 
 asm-x86_64/swiotlb.h                         |    1 
 asm-x86_64/system.h                          |    1 
 asm-x86_64/tlbflush.h                        |    1 
 asm-x86_64/topology.h                        |    1 
 asm-x86_64/uaccess.h                         |    1 
 asm-xtensa/atomic.h                          |    1 
 asm-xtensa/checksum.h                        |    1 
 asm-xtensa/delay.h                           |    1 
 asm-xtensa/dma.h                             |    1 
 asm-xtensa/hardirq.h                         |    1 
 asm-xtensa/ide.h                             |    1 
 asm-xtensa/io.h                              |    1 
 asm-xtensa/irq.h                             |    1 
 asm-xtensa/mmu_context.h                     |    1 
 asm-xtensa/page.h                            |    1 
 asm-xtensa/pgalloc.h                         |    1 
 asm-xtensa/platform.h                        |    1 
 asm-xtensa/system.h                          |    1 
 linux/acct.h                                 |    3 
 linux/acpi.h                                 |    1 
 linux/agpgart.h                              |    3 
 linux/amba/clcd.h                            |    1 
 linux/atmdev.h                               |    1 
 linux/audit.h                                |    4 -
 linux/blkdev.h                               |    1 
 linux/blktrace_api.h                         |    1 
 linux/blockgroup_lock.h                      |    1 
 linux/cache.h                                |    1 
 linux/coda.h                                 |    1 
 linux/compat.h                               |    1 
 linux/cpufreq.h                              |    1 
 linux/crypto.h                               |    1 
 linux/cyclomx.h                              |    1 
 linux/dcookies.h                             |    1 
 linux/devfs_fs_kernel.h                      |    1 
 linux/device.h                               |    1 
 linux/dmi.h                                  |    1 
 linux/dnotify.h                              |    1 
 linux/elf-em.h                               |   44 ++++++++++++
 linux/elf.h                                  |   59 ----------------
 linux/errqueue.h                             |    1 
 linux/ext2_fs.h                              |    2 
 linux/ext3_fs.h                              |    7 --
 linux/fs.h                                   |    1 
 linux/ftape.h                                |    1 
 linux/gameport.h                             |    6 +
 linux/generic_serial.h                       |    6 +
 linux/genhd.h                                |   12 +--
 linux/gfp.h                                  |    1 
 linux/hardirq.h                              |    1 
 linux/highmem.h                              |    1 
 linux/highuid.h                              |    1 
 linux/i2c-algo-ite.h                         |    7 +-
 linux/i2c.h                                  |    9 +-
 linux/ide.h                                  |    1 
 linux/if_frad.h                              |    1 
 linux/if_tr.h                                |    1 
 linux/init.h                                 |    1 
 linux/inotify.h                              |    1 
 linux/interrupt.h                            |    1 
 linux/ipmi.h                                 |    2 
 linux/ipv6.h                                 |    1 
 linux/irq.h                                  |    1 
 linux/irq_cpustat.h                          |    1 
 linux/isapnp.h                               |    1 
 linux/isdn.h                                 |    1 
 linux/isdn/tpam.h                            |    1 
 linux/isdn_ppp.h                             |    1 
 linux/isdnif.h                               |    1 
 linux/kallsyms.h                             |    1 
 linux/kernel_stat.h                          |    1 
 linux/kmod.h                                 |    1 
 linux/kprobes.h                              |    1 
 linux/linkage.h                              |    1 
 linux/lockd/lockd.h                          |    1 
 linux/lockd/nlm.h                            |    1 
 linux/mempolicy.h                            |    1 
 linux/migrate.h                              |    1 
 linux/mm.h                                   |    1 
 linux/mman.h                                 |   12 ++-
 linux/mmzone.h                               |    1 
 linux/module.h                               |    1 
 linux/msg.h                                  |    2 
 linux/mtd/cfi.h                              |    1 
 linux/mtd/map.h                              |    1 
 linux/mtd/mtd.h                              |    1 
 linux/mtd/nand.h                             |    1 
 linux/mtd/physmap.h                          |    1 
 linux/mtd/xip.h                              |    1 
 linux/ncp_fs.h                               |    5 -
 linux/net.h                                  |    3 
 linux/netdevice.h                            |    1 
 linux/netfilter.h                            |    1 
 linux/netfilter_arp.h                        |    1 
 linux/netfilter_bridge.h                     |    1 
 linux/netfilter_ipv4.h                       |    1 
 linux/netfilter_ipv4/ip_conntrack.h          |    1 
 linux/netfilter_ipv4/listhelp.h              |    1 
 linux/nfs.h                                  |    8 +-
 linux/nfs4.h                                 |    6 -
 linux/nfs_fs.h                               |   39 +++++------
 linux/nfsd/nfsd.h                            |    1 
 linux/nfsd/nfsfh.h                           |    1 
 linux/nfsd/syscall.h                         |    1 
 linux/numa.h                                 |    1 
 linux/parport.h                              |    1 
 linux/pci.h                                  |    1 
 linux/percpu_counter.h                       |    1 
 linux/pm.h                                   |    1 
 linux/pm_legacy.h                            |    1 
 linux/pmu.h                                  |    1 
 linux/preempt.h                              |    1 
 linux/proc_fs.h                              |    1 
 linux/profile.h                              |    1 
 linux/quota.h                                |    4 -
 linux/quotaops.h                             |    1 
 linux/reiserfs_xattr.h                       |    3 
 linux/relay.h                                |    1 
 linux/rio.h                                  |    1 
 linux/rio_drv.h                              |    1 
 linux/rmap.h                                 |    1 
 linux/rtnetlink.h                            |    1 
 linux/rwsem.h                                |    1 
 linux/scc.h                                  |    1 
 linux/sched.h                                |   94 +++++++++++++--------------
 linux/seccomp.h                              |    1 
 linux/sem.h                                  |    2 
 linux/seqlock.h                              |    1 
 linux/serialP.h                              |    1 
 linux/serial_core.h                          |    1 
 linux/signal.h                               |    4 -
 linux/skbuff.h                               |    1 
 linux/slab.h                                 |    1 
 linux/smb_fs.h                               |    4 -
 linux/smp.h                                  |    1 
 linux/smp_lock.h                             |    1 
 linux/socket.h                               |    2 
 linux/spinlock.h                             |    1 
 linux/stop_machine.h                         |    1 
 linux/sunrpc/auth.h                          |    1 
 linux/sunrpc/debug.h                         |   24 +++---
 linux/sunrpc/stats.h                         |    1 
 linux/suspend.h                              |    1 
 linux/swap.h                                 |    1 
 linux/syscalls.h                             |    1 
 linux/sysrq.h                                |    1 
 linux/tcp.h                                  |    1 
 linux/threads.h                              |    1 
 linux/timer.h                                |    1 
 linux/timex.h                                |    1 
 linux/tty.h                                  |    1 
 linux/types.h                                |    1 
 linux/udp.h                                  |    1 
 linux/usb.h                                  |    1 
 linux/usb_usual.h                            |    1 
 linux/usbdevice_fs.h                         |    2 
 linux/vt_buffer.h                            |    1 
 linux/vt_kern.h                              |    1 
 linux/wait.h                                 |    1 
 linux/wanrouter.h                            |    4 -
 mtd/mtd-abi.h                                |    5 -
 net/addrconf.h                               |    1 
 net/af_unix.h                                |    1 
 net/ax25.h                                   |    1 
 net/compat.h                                 |    1 
 net/dst.h                                    |    1 
 net/icmp.h                                   |    1 
 net/inet6_hashtables.h                       |    1 
 net/inet_hashtables.h                        |    1 
 net/inet_sock.h                              |    1 
 net/inet_timewait_sock.h                     |    1 
 net/ip.h                                     |    1 
 net/ip_fib.h                                 |    1 
 net/ip_mp_alg.h                              |    1 
 net/ip_vs.h                                  |    1 
 net/ipv6.h                                   |    1 
 net/irda/irda.h                              |    1 
 net/irda/irda_device.h                       |    1 
 net/irda/irlap.h                             |    1 
 net/irda/irlmp.h                             |    1 
 net/irda/irlmp_frame.h                       |    1 
 net/irda/qos.h                               |    1 
 net/ndisc.h                                  |    1 
 net/netfilter/nf_conntrack.h                 |    1 
 net/pkt_act.h                                |    1 
 net/protocol.h                               |    1 
 net/raw.h                                    |    1 
 net/red.h                                    |    1 
 net/route.h                                  |    1 
 net/sch_generic.h                            |    1 
 net/sctp/sctp.h                              |    1 
 net/sock.h                                   |    1 
 net/tcp.h                                    |    1 
 pcmcia/ss.h                                  |    1 
 scsi/scsi_transport_fc.h                     |    1 
 scsi/scsi_transport_spi.h                    |    1 
 sound/driver.h                               |    1 
 video/edid.h                                 |    1 
 video/vga.h                                  |    1 
 864 files changed, 193 insertions(+), 1036 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-header-cleanup-git.patch	26 Apr 2006 12:22:04 -0000	1.1
+++ linux-2.6-header-cleanup-git.patch	26 Apr 2006 23:46:20 -0000	1.2
@@ -8312,6 +8312,28 @@
  #include <linux/wait.h> /* wait_queue_head_t */
  #include <linux/time.h> /* struct timeval */
  #include <linux/net.h>
+diff --git a/include/linux/audit.h b/include/linux/audit.h
+index 1c47c59..3199755 100644
+--- a/include/linux/audit.h
++++ b/include/linux/audit.h
+@@ -24,8 +24,7 @@
+ #ifndef _LINUX_AUDIT_H_
+ #define _LINUX_AUDIT_H_
+ 
+-#include <linux/sched.h>
+-#include <linux/elf.h>
++#include <linux/elf-em.h>
+ 
+ /* The netlink messages for the audit system is divided into blocks:
+  * 1000 - 1099 are for commanding the audit system
+@@ -267,6 +266,7 @@ struct audit_rule {		/* for AUDIT_LIST, 
+ };
+ 
+ #ifdef __KERNEL__
++#include <linux/sched.h>
+ 
+ struct audit_sig_info {
+ 	uid_t		uid;
 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
 index 59e1259..5d32731 100644
 --- a/include/linux/blkdev.h
@@ -8480,6 +8502,133 @@
  
  #ifdef CONFIG_DNOTIFY
  
+diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
+new file mode 100644
+index 0000000..114a96d
+--- /dev/null
++++ b/include/linux/elf-em.h
+@@ -0,0 +1,44 @@
++#ifndef _LINUX_ELF_EM_H
++#define _LINUX_ELF_EM_H
++
++/* These constants define the various ELF target machines */
++#define EM_NONE		0
++#define EM_M32		1
++#define EM_SPARC	2
++#define EM_386		3
++#define EM_68K		4
++#define EM_88K		5
++#define EM_486		6	/* Perhaps disused */
++#define EM_860		7
++#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
++#define EM_MIPS_RS4_BE	10	/* MIPS R4000 big-endian */
++#define EM_PARISC	15	/* HPPA */
++#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */
++#define EM_PPC		20	/* PowerPC */
++#define EM_PPC64	21       /* PowerPC64 */
++#define EM_SH		42	/* SuperH */
++#define EM_SPARCV9	43	/* SPARC v9 64-bit */
++#define EM_IA_64	50	/* HP/Intel IA-64 */
++#define EM_X86_64	62	/* AMD x86-64 */
++#define EM_S390		22	/* IBM S/390 */
++#define EM_CRIS		76	/* Axis Communications 32-bit embedded processor */
++#define EM_V850		87	/* NEC v850 */
++#define EM_M32R		88	/* Renesas M32R */
++#define EM_H8_300	46	/* Renesas H8/300,300H,H8S */
++#define EM_FRV		0x5441	/* Fujitsu FR-V */
++
++/*
++ * This is an interim value that we will use until the committee comes
++ * up with a final number.
++ */
++#define EM_ALPHA	0x9026
++
++/* Bogus old v850 magic number, used by old tools. */
++#define EM_CYGNUS_V850	0x9080
++/* Bogus old m32r magic number, used by old tools. */
++#define EM_CYGNUS_M32R	0x9041
++/* This is the old interim value for S/390 architecture */
++#define EM_S390_OLD	0xA390
++
++
++#endif /* _LINUX_ELF_EM_H */
+diff --git a/include/linux/elf.h b/include/linux/elf.h
+index d3bfacb..b70d1d2 100644
+--- a/include/linux/elf.h
++++ b/include/linux/elf.h
+@@ -3,6 +3,7 @@ #define _LINUX_ELF_H
+ 
+ #include <linux/types.h>
+ #include <linux/auxvec.h>
++#include <linux/elf-em.h>
+ #include <asm/elf.h>
+ 
+ #ifndef elf_read_implies_exec
+@@ -55,64 +56,6 @@ #define ET_CORE   4
+ #define ET_LOPROC 0xff00
+ #define ET_HIPROC 0xffff
+ 
+-/* These constants define the various ELF target machines */
+-#define EM_NONE  0
+-#define EM_M32   1
+-#define EM_SPARC 2
+-#define EM_386   3
+-#define EM_68K   4
+-#define EM_88K   5
+-#define EM_486   6   /* Perhaps disused */
+-#define EM_860   7
+-
+-#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
+-
+-#define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
+-
+-#define EM_PARISC      15	/* HPPA */
+-
+-#define EM_SPARC32PLUS 18	/* Sun's "v8plus" */
+-
+-#define EM_PPC	       20	/* PowerPC */
+-#define EM_PPC64       21       /* PowerPC64 */
+-
+-#define EM_SH	       42	/* SuperH */
+-
+-#define EM_SPARCV9     43	/* SPARC v9 64-bit */
+-
+-#define EM_IA_64	50	/* HP/Intel IA-64 */
+-
+-#define EM_X86_64	62	/* AMD x86-64 */
+-
+-#define EM_S390		22	/* IBM S/390 */
+-
+-#define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
+-
+-#define EM_V850		87	/* NEC v850 */
+-
+-#define EM_M32R		88	/* Renesas M32R */
+-
+-#define EM_H8_300       46      /* Renesas H8/300,300H,H8S */
+-
+-/*
+- * This is an interim value that we will use until the committee comes
+- * up with a final number.
+- */
+-#define EM_ALPHA	0x9026
+-
+-/* Bogus old v850 magic number, used by old tools.  */
+-#define EM_CYGNUS_V850	0x9080
+-
+-/* Bogus old m32r magic number, used by old tools.  */
+-#define EM_CYGNUS_M32R	0x9041
+-
+-/*
+- * This is the old interim value for S/390 architecture
+- */
+-#define EM_S390_OLD     0xA390
+-
+-#define EM_FRV		0x5441		/* Fujitsu FR-V */
+-
+ /* This is the info that is needed to parse the dynamic section of the file */
+ #define DT_NULL		0
+ #define DT_NEEDED	1
 diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
 index 174582f..408118a 100644
 --- a/include/linux/errqueue.h
@@ -9784,37 +9933,101 @@
  /* selection of hardware types */
  
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 29b7d4f..2e05e40 100644
+index 29b7d4f..701b8cb 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,46 @@
  #ifndef _LINUX_SCHED_H
  #define _LINUX_SCHED_H
  
++#include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
++
++/*
++ * cloning flags:
++ */
++#define CSIGNAL		0x000000ff	/* signal mask to be sent at exit */
++#define CLONE_VM	0x00000100	/* set if VM shared between processes */
++#define CLONE_FS	0x00000200	/* set if fs info shared between processes */
++#define CLONE_FILES	0x00000400	/* set if open files shared between processes */
++#define CLONE_SIGHAND	0x00000800	/* set if signal handlers and blocked signals shared */
++#define CLONE_PTRACE	0x00002000	/* set if we want to let tracing continue on the child too */
++#define CLONE_VFORK	0x00004000	/* set if the parent wants the child to wake it up on mm_release */
++#define CLONE_PARENT	0x00008000	/* set if we want to have the same parent as the cloner */
++#define CLONE_THREAD	0x00010000	/* Same thread group? */
++#define CLONE_NEWNS	0x00020000	/* New namespace group? */
++#define CLONE_SYSVSEM	0x00040000	/* share system V SEM_UNDO semantics */
++#define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */
++#define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */
++#define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */
++#define CLONE_DETACHED		0x00400000	/* Unused, ignored */
++#define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
++#define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
++#define CLONE_STOPPED		0x02000000	/* Start in stopped state */
++
++/*
++ * Scheduling policies
++ */
++#define SCHED_NORMAL		0
++#define SCHED_FIFO		1
++#define SCHED_RR		2
++#define SCHED_BATCH		3
++
 +#ifdef __KERNEL__
++
++struct sched_param {
++	int sched_priority;
++};
++
  #include <asm/param.h>	/* for HZ */
  
 -#include <linux/config.h>
  #include <linux/capability.h>
  #include <linux/threads.h>
  #include <linux/kernel.h>
-@@ -37,6 +37,15 @@ #include <linux/seccomp.h>
+@@ -37,33 +74,17 @@ #include <linux/seccomp.h>
  #include <linux/rcupdate.h>
  #include <linux/futex.h>
  
+-#include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
 +#include <linux/time.h>
 +#include <linux/param.h>
 +#include <linux/resource.h>
 +#include <linux/timer.h>
 +#include <linux/hrtimer.h>
-+
+ 
+-struct exec_domain;
+-extern int exec_shield;
+-extern int print_fatal_signals;
 +#include <asm/processor.h>
-+#endif
-+
- #include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
  
- struct exec_domain;
-@@ -103,13 +112,6 @@ extern unsigned long nr_uninterruptible(
+-/*
+- * cloning flags:
+- */
+-#define CSIGNAL		0x000000ff	/* signal mask to be sent at exit */
+-#define CLONE_VM	0x00000100	/* set if VM shared between processes */
+-#define CLONE_FS	0x00000200	/* set if fs info shared between processes */
+-#define CLONE_FILES	0x00000400	/* set if open files shared between processes */
+-#define CLONE_SIGHAND	0x00000800	/* set if signal handlers and blocked signals shared */
+-#define CLONE_PTRACE	0x00002000	/* set if we want to let tracing continue on the child too */
+-#define CLONE_VFORK	0x00004000	/* set if the parent wants the child to wake it up on mm_release */
+-#define CLONE_PARENT	0x00008000	/* set if we want to have the same parent as the cloner */
+-#define CLONE_THREAD	0x00010000	/* Same thread group? */
+-#define CLONE_NEWNS	0x00020000	/* New namespace group? */
+-#define CLONE_SYSVSEM	0x00040000	/* share system V SEM_UNDO semantics */
+-#define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */
+-#define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */
+-#define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */
+-#define CLONE_DETACHED		0x00400000	/* Unused, ignored */
+-#define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
+-#define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
+-#define CLONE_STOPPED		0x02000000	/* Start in stopped state */
++struct exec_domain;
++extern int exec_shield;
++extern int print_fatal_signals;
+ 
+ /*
+  * List of flags we want to share for kernel threads,
+@@ -103,13 +124,6 @@ extern unsigned long nr_uninterruptible(
  extern unsigned long nr_active(void);
  extern unsigned long nr_iowait(void);
  
@@ -9828,6 +10041,27 @@
  
  /*
   * Task state bitmask. NOTE! These bits are also
+@@ -156,20 +170,6 @@ #define set_current_state(state_value)		
+ /* Task command name length */
+ #define TASK_COMM_LEN 16
+ 
+-/*
+- * Scheduling policies
+- */
+-#define SCHED_NORMAL		0
+-#define SCHED_FIFO		1
+-#define SCHED_RR		2
+-#define SCHED_BATCH		3
+-
+-struct sched_param {
+-	int sched_priority;
+-};
+-
+-#ifdef __KERNEL__
+-
+ #include <linux/spinlock.h>
+ 
+ /*
 diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
 index cd2773b..3e8b1cf 100644
 --- a/include/linux/seccomp.h

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 ++
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    6 +
 include/asm-m32r/Kbuild               |    7 ++
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   15 ++++
 include/asm-um/Kbuild                 |   14 ++++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   10 ++
 include/linux/Kbuild                  |   63 ++++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  116 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 489 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-header-install-git.patch	26 Apr 2006 20:11:56 -0000	1.2
+++ linux-2.6-header-install-git.patch	26 Apr 2006 23:46:20 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index a940eae..09a420f 100644
+index a940eae..ca470f5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -858,6 +858,21 @@ depend dep:
@@ -155,13 +155,13 @@
 +unifdef-y += mtrr.h vm86.h
 diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
 new file mode 100644
-index 0000000..e1200f3
+index 0000000..178f555
 --- /dev/null
 +++ b/include/asm-ia64/Kbuild
 @@ -0,0 +1,6 @@
 +include include/asm-generic/Kbuild.asm
 +
-+header-y += break.h fpswa.h fpu.h ia64regs.h kprobes.h perfmon_default_smpl.h \
++header-y += break.h fpu.h fwspa.h ia64regs.h kprobes.h perfmon_default_smpl.h \
 +	 ptrace_offsets.h rse.h setup.h ucontext.h
 +
 +unifdef-y += perfmon.h
@@ -412,7 +412,7 @@
 +unifdef-y += ia32.h mce.h mtrr.h vsyscall.h
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
 new file mode 100644
-index 0000000..54e8c3e
+index 0000000..ad45a99
 --- /dev/null
 +++ b/include/linux/Kbuild
 @@ -0,0 +1,63 @@
@@ -428,7 +428,7 @@
 +	bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h		\
 +	consolemap.h crc-ccitt.h cycx_cfm.h cycx_x25.h			\
 +	devfs_fs.h dn.h dqblk_v1.h dqblk_v2.h dqblk_xfs.h efs_fs_sb.h	\
-+	elf-fdpic.h elf.h ethtool.h fadvise.h fd.h			\
++	elf-fdpic.h elf.h elf-em.h ethtool.h fadvise.h fd.h		\
 +	ftape-header-segment.h ftape-vendors.h fuse.h futex.h		\
 +	genetlink.h gen_stats.h gigaset_dev.h hdsmart.h hpfs_fs.h	\
 +	hysdn_if.h i2c-dev.h i2c-id.h i8k.h icmp.h if_arcnet.h		\




More information about the fedora-cvs-commits mailing list