--- /dev/null
+From fadcfa33b6319a5faf8af2287f08bf93a7f926b6 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Tue, 19 Sep 2006 12:43:58 +0100
+Subject: [PATCH 1/15] [HEADERS] One line per header in Kbuild files to reduce conflicts
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/Kbuild | 11
+ include/asm-alpha/Kbuild | 10
+ include/asm-generic/Kbuild | 15 +
+ include/asm-generic/Kbuild.asm | 38 ++-
+ include/asm-i386/Kbuild | 9
+ include/asm-ia64/Kbuild | 18 +
+ include/asm-powerpc/Kbuild | 45 +++
+ include/asm-s390/Kbuild | 11
+ include/asm-sparc/Kbuild | 24 +-
+ include/asm-sparc64/Kbuild | 27 +-
+ include/asm-x86_64/Kbuild | 18 +
+ include/linux/Kbuild | 400 ++++++++++++++++++++++++++++------
+ include/linux/byteorder/Kbuild | 9
+ include/linux/dvb/Kbuild | 11
+ include/linux/netfilter/Kbuild | 47 +++
+ include/linux/netfilter_arp/Kbuild | 5
+ include/linux/netfilter_bridge/Kbuild | 21 +
+ include/linux/netfilter_ipv4/Kbuild | 82 +++++-
+ include/linux/netfilter_ipv6/Kbuild | 27 +-
+ include/linux/nfsd/Kbuild | 9
+ include/linux/raid/Kbuild | 3
+ include/linux/sunrpc/Kbuild | 2
+ include/linux/tc_act/Kbuild | 5
+ include/linux/tc_ematch/Kbuild | 5
+ include/mtd/Kbuild | 8
+ include/rdma/Kbuild | 2
+ include/scsi/Kbuild | 4
+ include/sound/Kbuild | 12 -
+ include/video/Kbuild | 2
+ 29 files changed, 721 insertions(+), 159 deletions(-)
+
+--- linux-2.6.18.orig/include/Kbuild
++++ linux-2.6.18/include/Kbuild
+@@ -1,2 +1,9 @@
+-header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/
+-header-y += asm-$(ARCH)/
++header-y += asm-generic/
++header-y += linux/
++header-y += scsi/
++header-y += sound/
++header-y += mtd/
++header-y += rdma/
++header-y += video/
++
++header-y += asm-$(ARCH)/
+--- linux-2.6.18.orig/include/asm-alpha/Kbuild
++++ linux-2.6.18/include/asm-alpha/Kbuild
+@@ -1,5 +1,11 @@
+ include include/asm-generic/Kbuild.asm
+
+-unifdef-y += console.h fpu.h sysinfo.h compiler.h
++header-y += gentrap.h
++header-y += regdef.h
++header-y += pal.h
++header-y += reg.h
+
+-header-y += gentrap.h regdef.h pal.h reg.h
++unifdef-y += console.h
++unifdef-y += fpu.h
++unifdef-y += sysinfo.h
++unifdef-y += compiler.h
+--- linux-2.6.18.orig/include/asm-generic/Kbuild
++++ linux-2.6.18/include/asm-generic/Kbuild
+@@ -1,3 +1,12 @@
+-header-y += atomic.h errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h \
+- signal.h statfs.h
+-unifdef-y := resource.h siginfo.h
++header-y += atomic.h
++header-y += errno-base.h
++header-y += errno.h
++header-y += fcntl.h
++header-y += ioctl.h
++header-y += ipc.h
++header-y += mman.h
++header-y += signal.h
++header-y += statfs.h
++
++unifdef-y += resource.h
++unifdef-y += siginfo.h
+--- linux-2.6.18.orig/include/asm-generic/Kbuild.asm
++++ linux-2.6.18/include/asm-generic/Kbuild.asm
+@@ -1,8 +1,34 @@
+-unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \
+- ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \
+- posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \
+- sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h \
+- statfs.h termbits.h termios.h types.h unistd.h user.h
++unifdef-y += a.out.h
++unifdef-y += auxvec.h
++unifdef-y += byteorder.h
++unifdef-y += errno.h
++unifdef-y += fcntl.h
++unifdef-y += ioctl.h
++unifdef-y += ioctls.h
++unifdef-y += ipcbuf.h
++unifdef-y += mman.h
++unifdef-y += msgbuf.h
++unifdef-y += param.h
++unifdef-y += poll.h
++unifdef-y += posix_types.h
++unifdef-y += ptrace.h
++unifdef-y += resource.h
++unifdef-y += sembuf.h
++unifdef-y += shmbuf.h
++unifdef-y += sigcontext.h
++unifdef-y += siginfo.h
++unifdef-y += signal.h
++unifdef-y += socket.h
++unifdef-y += sockios.h
++unifdef-y += stat.h
++unifdef-y += statfs.h
++unifdef-y += termbits.h
++unifdef-y += termios.h
++unifdef-y += types.h
++unifdef-y += unistd.h
++unifdef-y += user.h
+
+ # These probably shouldn't be exported
+-unifdef-y += elf.h page.h
++unifdef-y += shmparam.h
++unifdef-y += elf.h
++unifdef-y += page.h
+--- linux-2.6.18.orig/include/asm-i386/Kbuild
++++ linux-2.6.18/include/asm-i386/Kbuild
+@@ -1,5 +1,10 @@
+ include include/asm-generic/Kbuild.asm
+
+-header-y += boot.h debugreg.h ldt.h ucontext.h
++header-y += boot.h
++header-y += debugreg.h
++header-y += ldt.h
++header-y += ucontext.h
+
+-unifdef-y += mtrr.h setup.h vm86.h
++unifdef-y += mtrr.h
++unifdef-y += setup.h
++unifdef-y += vm86.h
+--- linux-2.6.18.orig/include/asm-ia64/Kbuild
++++ linux-2.6.18/include/asm-ia64/Kbuild
+@@ -1,7 +1,17 @@
+ include include/asm-generic/Kbuild.asm
+
+-header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h \
+- intel_intrin.h intrinsics.h perfmon_default_smpl.h \
+- ptrace_offsets.h rse.h setup.h ucontext.h
++header-y += break.h
++header-y += fpu.h
++header-y += fpswa.h
++header-y += gcc_intrin.h
++header-y += ia64regs.h
++header-y += intel_intrin.h
++header-y += intrinsics.h
++header-y += perfmon_default_smpl.h
++header-y += ptrace_offsets.h
++header-y += rse.h
++header-y += setup.h
++header-y += ucontext.h
+
+-unifdef-y += perfmon.h ustack.h
++unifdef-y += perfmon.h
++unifdef-y += ustack.h
+--- linux-2.6.18.orig/include/asm-powerpc/Kbuild
++++ linux-2.6.18/include/asm-powerpc/Kbuild
+@@ -1,10 +1,41 @@
+ include include/asm-generic/Kbuild.asm
+
+-unifdef-y += a.out.h asm-compat.h bootx.h byteorder.h cputable.h elf.h \
+- nvram.h param.h posix_types.h ptrace.h seccomp.h signal.h \
+- termios.h types.h unistd.h
++header-y += auxvec.h
++header-y += ioctls.h
++header-y += mman.h
++header-y += sembuf.h
++header-y += siginfo.h
++header-y += stat.h
++header-y += errno.h
++header-y += ipcbuf.h
++header-y += msgbuf.h
++header-y += shmbuf.h
++header-y += socket.h
++header-y += termbits.h
++header-y += fcntl.h
++header-y += ipc.h
++header-y += poll.h
++header-y += shmparam.h
++header-y += sockios.h
++header-y += ucontext.h
++header-y += ioctl.h
++header-y += linkage.h
++header-y += resource.h
++header-y += sigcontext.h
++header-y += statfs.h
+
+-header-y += auxvec.h ioctls.h mman.h sembuf.h siginfo.h stat.h errno.h \
+- ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h \
+- poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h \
+- resource.h sigcontext.h statfs.h
++unifdef-y += a.out.h
++unifdef-y += asm-compat.h
++unifdef-y += bootx.h
++unifdef-y += byteorder.h
++unifdef-y += cputable.h
++unifdef-y += elf.h
++unifdef-y += nvram.h
++unifdef-y += param.h
++unifdef-y += posix_types.h
++unifdef-y += ptrace.h
++unifdef-y += seccomp.h
++unifdef-y += signal.h
++unifdef-y += termios.h
++unifdef-y += types.h
++unifdef-y += unistd.h
+--- linux-2.6.18.orig/include/asm-s390/Kbuild
++++ linux-2.6.18/include/asm-s390/Kbuild
+@@ -1,4 +1,11 @@
+ include include/asm-generic/Kbuild.asm
+
+-unifdef-y += cmb.h debug.h
+-header-y += dasd.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h
++header-y += dasd.h
++header-y += qeth.h
++header-y += tape390.h
++header-y += ucontext.h
++header-y += vtoc.h
++header-y += z90crypt.h
++
++unifdef-y += cmb.h
++unifdef-y += debug.h
+--- linux-2.6.18.orig/include/asm-sparc/Kbuild
++++ linux-2.6.18/include/asm-sparc/Kbuild
+@@ -1,6 +1,22 @@
+ include include/asm-generic/Kbuild.asm
+
+-unifdef-y += fbio.h perfctr.h psr.h
+-header-y += apc.h asi.h auxio.h bpp.h head.h ipc.h jsflash.h \
+- openpromio.h pbm.h pconf.h pgtsun4.h reg.h traps.h \
+- turbosparc.h vfc_ioctls.h winmacro.h
++header-y += apc.h
++header-y += asi.h
++header-y += auxio.h
++header-y += bpp.h
++header-y += head.h
++header-y += ipc.h
++header-y += jsflash.h
++header-y += openpromio.h
++header-y += pbm.h
++header-y += pconf.h
++header-y += pgtsun4.h
++header-y += reg.h
++header-y += traps.h
++header-y += turbosparc.h
++header-y += vfc_ioctls.h
++header-y += winmacro.h
++
++unifdef-y += fbio.h
++unifdef-y += perfctr.h
++unifdef-y += psr.h
+--- linux-2.6.18.orig/include/asm-sparc64/Kbuild
++++ linux-2.6.18/include/asm-sparc64/Kbuild
+@@ -4,7 +4,26 @@ ALTARCH := sparc
+ ARCHDEF := defined __sparc__ && defined __arch64__
+ ALTARCHDEF := defined __sparc__ && !defined __arch64__
+
+-unifdef-y += fbio.h perfctr.h
+-header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h \
+- ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h \
+- pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h
++header-y += apb.h
++header-y += asi.h
++header-y += bbc.h
++header-y += bpp.h
++header-y += display7seg.h
++header-y += envctrl.h
++header-y += floppy.h
++header-y += ipc.h
++header-y += kdebug.h
++header-y += mostek.h
++header-y += openprom.h
++header-y += openpromio.h
++header-y += parport.h
++header-y += pconf.h
++header-y += psrcompat.h
++header-y += pstate.h
++header-y += reg.h
++header-y += uctx.h
++header-y += utrap.h
++header-y += watchdog.h
++
++unifdef-y += fbio.h
++unifdef-y += perfctr.h
+--- linux-2.6.18.orig/include/asm-x86_64/Kbuild
++++ linux-2.6.18/include/asm-x86_64/Kbuild
+@@ -4,8 +4,18 @@ ALTARCH := i386
+ ARCHDEF := defined __x86_64__
+ ALTARCHDEF := defined __i386__
+
+-header-y += boot.h bootsetup.h cpufeature.h debugreg.h ldt.h \
+- msr.h prctl.h setup.h sigcontext32.h ucontext.h \
+- vsyscall32.h
++header-y += boot.h
++header-y += bootsetup.h
++header-y += cpufeature.h
++header-y += debugreg.h
++header-y += ldt.h
++header-y += msr.h
++header-y += prctl.h
++header-y += setup.h
++header-y += sigcontext32.h
++header-y += ucontext.h
++header-y += vsyscall32.h
+
+-unifdef-y += mce.h mtrr.h vsyscall.h
++unifdef-y += mce.h
++unifdef-y += mtrr.h
++unifdef-y += vsyscall.h
+--- linux-2.6.18.orig/include/linux/Kbuild
++++ linux-2.6.18/include/linux/Kbuild
+@@ -1,63 +1,343 @@
+-header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/ \
+- netfilter/ netfilter_arp/ netfilter_bridge/ netfilter_ipv4/ \
+- netfilter_ipv6/
++header-y += byteorder/
++header-y += dvb/
++header-y += hdlc/
++header-y += isdn/
++header-y += nfsd/
++header-y += raid/
++header-y += sunrpc/
++header-y += tc_act/
++header-y += netfilter/
++header-y += netfilter_arp/
++header-y += netfilter_bridge/
++header-y += netfilter_ipv4/
++header-y += netfilter_ipv6/
+
+-header-y += affs_fs.h affs_hardblocks.h aio_abi.h a.out.h arcfb.h \
+- atmapi.h atmbr2684.h atmclip.h atm_eni.h atm_he.h \
+- atm_idt77105.h atmioc.h atmlec.h atmmpc.h atm_nicstar.h \
+- atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h \
+- awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h \
+- bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h \
+- consolemap.h cycx_cfm.h dm-ioctl.h dn.h dqblk_v1.h \
+- dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h \
+- fadvise.h fd.h fdreg.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 i8k.h icmp.h \
+- if_arcnet.h if_arp.h if_bonding.h if_cablemodem.h if_fc.h \
+- if_fddi.h if.h if_hippi.h if_infiniband.h if_packet.h \
+- if_plip.h if_ppp.h if_slip.h if_strip.h if_tunnel.h in6.h \
+- in_route.h ioctl.h ip.h ipmi_msgdefs.h ip_mp_alg.h ipsec.h \
+- ipx.h irda.h isdn_divertif.h iso_fs.h ite_gpio.h ixjuser.h \
+- jffs2.h keyctl.h limits.h major.h matroxfb.h meye.h minix_fs.h \
+- mmtimer.h mqueue.h mtio.h ncp_no.h netfilter_arp.h netrom.h \
+- nfs2.h nfs4_mount.h nfs_mount.h openprom_fs.h param.h \
+- pci_ids.h pci_regs.h personality.h pfkeyv2.h pg.h pkt_cls.h \
+- pkt_sched.h posix_types.h ppdev.h prctl.h ps2esdi.h qic117.h \
+- qnxtypes.h quotaio_v1.h quotaio_v2.h radeonfb.h raw.h \
+- resource.h rose.h sctp.h smbno.h snmp.h sockios.h som.h \
+- sound.h stddef.h synclink.h telephony.h termios.h ticable.h \
+- times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h utime.h \
+- utsname.h video_decoder.h video_encoder.h videotext.h vt.h \
+- wavefront.h wireless.h xattr.h x25.h zorro_ids.h
++header-y += affs_fs.h
++header-y += affs_hardblocks.h
++header-y += aio_abi.h
++header-y += a.out.h
++header-y += arcfb.h
++header-y += atmapi.h
++header-y += atmbr2684.h
++header-y += atmclip.h
++header-y += atm_eni.h
++header-y += atm_he.h
++header-y += atm_idt77105.h
++header-y += atmioc.h
++header-y += atmlec.h
++header-y += atmmpc.h
++header-y += atm_nicstar.h
++header-y += atmppp.h
++header-y += atmsap.h
++header-y += atmsvc.h
++header-y += atm_zatm.h
++header-y += auto_fs4.h
++header-y += auxvec.h
++header-y += awe_voice.h
++header-y += ax25.h
++header-y += b1lli.h
++header-y += baycom.h
++header-y += bfs_fs.h
++header-y += blkpg.h
++header-y += bpqether.h
++header-y += cdk.h
++header-y += chio.h
++header-y += coda_psdev.h
++header-y += coff.h
++header-y += comstats.h
++header-y += consolemap.h
++header-y += cycx_cfm.h
++header-y += dm-ioctl.h
++header-y += dn.h
++header-y += dqblk_v1.h
++header-y += dqblk_v2.h
++header-y += dqblk_xfs.h
++header-y += efs_fs_sb.h
++header-y += elf-fdpic.h
++header-y += elf.h
++header-y += elf-em.h
++header-y += fadvise.h
++header-y += fd.h
++header-y += fdreg.h
++header-y += ftape-header-segment.h
++header-y += ftape-vendors.h
++header-y += fuse.h
++header-y += futex.h
++header-y += genetlink.h
++header-y += gen_stats.h
++header-y += gigaset_dev.h
++header-y += hdsmart.h
++header-y += hpfs_fs.h
++header-y += hysdn_if.h
++header-y += i2c-dev.h
++header-y += i8k.h
++header-y += icmp.h
++header-y += if_arcnet.h
++header-y += if_arp.h
++header-y += if_bonding.h
++header-y += if_cablemodem.h
++header-y += if_fc.h
++header-y += if_fddi.h
++header-y += if.h
++header-y += if_hippi.h
++header-y += if_infiniband.h
++header-y += if_packet.h
++header-y += if_plip.h
++header-y += if_ppp.h
++header-y += if_slip.h
++header-y += if_strip.h
++header-y += if_tunnel.h
++header-y += in6.h
++header-y += in_route.h
++header-y += ioctl.h
++header-y += ip.h
++header-y += ipmi_msgdefs.h
++header-y += ip_mp_alg.h
++header-y += ipsec.h
++header-y += ipx.h
++header-y += irda.h
++header-y += isdn_divertif.h
++header-y += iso_fs.h
++header-y += ite_gpio.h
++header-y += ixjuser.h
++header-y += jffs2.h
++header-y += keyctl.h
++header-y += limits.h
++header-y += major.h
++header-y += matroxfb.h
++header-y += meye.h
++header-y += minix_fs.h
++header-y += mmtimer.h
++header-y += mqueue.h
++header-y += mtio.h
++header-y += ncp_no.h
++header-y += netfilter_arp.h
++header-y += netrom.h
++header-y += nfs2.h
++header-y += nfs4_mount.h
++header-y += nfs_mount.h
++header-y += openprom_fs.h
++header-y += param.h
++header-y += pci_ids.h
++header-y += pci_regs.h
++header-y += personality.h
++header-y += pfkeyv2.h
++header-y += pg.h
++header-y += pkt_cls.h
++header-y += pkt_sched.h
++header-y += posix_types.h
++header-y += ppdev.h
++header-y += prctl.h
++header-y += ps2esdi.h
++header-y += qic117.h
++header-y += qnxtypes.h
++header-y += quotaio_v1.h
++header-y += quotaio_v2.h
++header-y += radeonfb.h
++header-y += raw.h
++header-y += resource.h
++header-y += rose.h
++header-y += sctp.h
++header-y += smbno.h
++header-y += snmp.h
++header-y += sockios.h
++header-y += som.h
++header-y += sound.h
++header-y += stddef.h
++header-y += synclink.h
++header-y += telephony.h
++header-y += termios.h
++header-y += ticable.h
++header-y += times.h
++header-y += tiocl.h
++header-y += tipc.h
++header-y += toshiba.h
++header-y += ultrasound.h
++header-y += un.h
++header-y += utime.h
++header-y += utsname.h
++header-y += video_decoder.h
++header-y += video_encoder.h
++header-y += videotext.h
++header-y += vt.h
++header-y += wavefront.h
++header-y += wireless.h
++header-y += xattr.h
++header-y += x25.h
++header-y += zorro_ids.h
+
+-unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h \
+- atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h \
+- capability.h capi.h cciss_ioctl.h cdrom.h cm4000_cs.h \
+- cn_proc.h coda.h connector.h cramfs_fs.h cuda.h cyclades.h \
+- dccp.h dirent.h divert.h elfcore.h errno.h errqueue.h \
+- ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h \
+- filter.h flat.h fs.h ftape.h gameport.h generic_serial.h \
+- genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h \
+- i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h \
+- if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h \
+- if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h \
+- inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h \
+- ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h \
+- joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h \
+- llc.h loop.h lp.h mempolicy.h mii.h mman.h mroute.h msdos_fs.h \
+- msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h \
+- netfilter_bridge.h netfilter_decnet.h netfilter.h \
+- netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h \
+- netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h \
+- n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h \
+- pmu.h poll.h ppp_defs.h ppp-comp.h ptrace.h qnx4_fs.h quota.h \
+- random.h reboot.h reiserfs_fs.h reiserfs_xattr.h romfs_fs.h \
+- route.h rtc.h rtnetlink.h scc.h sched.h sdla.h \
+- selinux_netlink.h sem.h serial_core.h serial.h serio.h shm.h \
+- signal.h smb_fs.h smb.h smb_mount.h socket.h sonet.h sonypi.h \
+- soundcard.h stat.h sysctl.h tcp.h time.h timex.h tty.h types.h \
+- udf_fs_i.h udp.h uinput.h uio.h unistd.h usb_ch9.h \
+- usbdevice_fs.h user.h videodev2.h videodev.h wait.h \
+- wanrouter.h watchdog.h xfrm.h zftape.h
++unifdef-y += acct.h
++unifdef-y += adb.h
++unifdef-y += adfs_fs.h
++unifdef-y += agpgart.h
++unifdef-y += apm_bios.h
++unifdef-y += atalk.h
++unifdef-y += atmarp.h
++unifdef-y += atmdev.h
++unifdef-y += atm.h
++unifdef-y += atm_tcp.h
++unifdef-y += audit.h
++unifdef-y += auto_fs.h
++unifdef-y += binfmts.h
++unifdef-y += capability.h
++unifdef-y += capi.h
++unifdef-y += cciss_ioctl.h
++unifdef-y += cdrom.h
++unifdef-y += cm4000_cs.h
++unifdef-y += cn_proc.h
++unifdef-y += coda.h
++unifdef-y += connector.h
++unifdef-y += cramfs_fs.h
++unifdef-y += cuda.h
++unifdef-y += cyclades.h
++unifdef-y += dccp.h
++unifdef-y += dirent.h
++unifdef-y += divert.h
++unifdef-y += elfcore.h
++unifdef-y += errno.h
++unifdef-y += errqueue.h
++unifdef-y += ethtool.h
++unifdef-y += eventpoll.h
++unifdef-y += ext2_fs.h
++unifdef-y += ext3_fs.h
++unifdef-y += fb.h
++unifdef-y += fcntl.h
++unifdef-y += filter.h
++unifdef-y += flat.h
++unifdef-y += fs.h
++unifdef-y += ftape.h
++unifdef-y += gameport.h
++unifdef-y += generic_serial.h
++unifdef-y += genhd.h
++unifdef-y += hayesesp.h
++unifdef-y += hdlcdrv.h
++unifdef-y += hdlc.h
++unifdef-y += hdreg.h
++unifdef-y += hiddev.h
++unifdef-y += hpet.h
++unifdef-y += i2c.h
++unifdef-y += i2o-dev.h
++unifdef-y += icmpv6.h
++unifdef-y += if_bridge.h
++unifdef-y += if_ec.h
++unifdef-y += if_eql.h
++unifdef-y += if_ether.h
++unifdef-y += if_frad.h
++unifdef-y += if_ltalk.h
++unifdef-y += if_pppox.h
++unifdef-y += if_shaper.h
++unifdef-y += if_tr.h
++unifdef-y += if_tun.h
++unifdef-y += if_vlan.h
++unifdef-y += if_wanpipe.h
++unifdef-y += igmp.h
++unifdef-y += inet_diag.h
++unifdef-y += in.h
++unifdef-y += inotify.h
++unifdef-y += input.h
++unifdef-y += ipc.h
++unifdef-y += ipmi.h
++unifdef-y += ipv6.h
++unifdef-y += ipv6_route.h
++unifdef-y += isdn.h
++unifdef-y += isdnif.h
++unifdef-y += isdn_ppp.h
++unifdef-y += isicom.h
++unifdef-y += jbd.h
++unifdef-y += joystick.h
++unifdef-y += kdev_t.h
++unifdef-y += kd.h
++unifdef-y += kernelcapi.h
++unifdef-y += kernel.h
++unifdef-y += keyboard.h
++unifdef-y += llc.h
++unifdef-y += loop.h
++unifdef-y += lp.h
++unifdef-y += mempolicy.h
++unifdef-y += mii.h
++unifdef-y += mman.h
++unifdef-y += mroute.h
++unifdef-y += msdos_fs.h
++unifdef-y += msg.h
++unifdef-y += nbd.h
++unifdef-y += ncp_fs.h
++unifdef-y += ncp.h
++unifdef-y += ncp_mount.h
++unifdef-y += netdevice.h
++unifdef-y += netfilter_bridge.h
++unifdef-y += netfilter_decnet.h
++unifdef-y += netfilter.h
++unifdef-y += netfilter_ipv4.h
++unifdef-y += netfilter_ipv6.h
++unifdef-y += netfilter_logging.h
++unifdef-y += net.h
++unifdef-y += netlink.h
++unifdef-y += nfs3.h
++unifdef-y += nfs4.h
++unifdef-y += nfsacl.h
++unifdef-y += nfs_fs.h
++unifdef-y += nfs.h
++unifdef-y += nfs_idmap.h
++unifdef-y += n_r3964.h
++unifdef-y += nubus.h
++unifdef-y += nvram.h
++unifdef-y += parport.h
++unifdef-y += patchkey.h
++unifdef-y += pci.h
++unifdef-y += pktcdvd.h
++unifdef-y += pmu.h
++unifdef-y += poll.h
++unifdef-y += ppp_defs.h
++unifdef-y += ppp-comp.h
++unifdef-y += ptrace.h
++unifdef-y += qnx4_fs.h
++unifdef-y += quota.h
++unifdef-y += random.h
++unifdef-y += reboot.h
++unifdef-y += reiserfs_fs.h
++unifdef-y += reiserfs_xattr.h
++unifdef-y += romfs_fs.h
++unifdef-y += route.h
++unifdef-y += rtc.h
++unifdef-y += rtnetlink.h
++unifdef-y += scc.h
++unifdef-y += sched.h
++unifdef-y += sdla.h
++unifdef-y += selinux_netlink.h
++unifdef-y += sem.h
++unifdef-y += serial_core.h
++unifdef-y += serial.h
++unifdef-y += serio.h
++unifdef-y += shm.h
++unifdef-y += signal.h
++unifdef-y += smb_fs.h
++unifdef-y += smb.h
++unifdef-y += smb_mount.h
++unifdef-y += socket.h
++unifdef-y += sonet.h
++unifdef-y += sonypi.h
++unifdef-y += soundcard.h
++unifdef-y += stat.h
++unifdef-y += sysctl.h
++unifdef-y += tcp.h
++unifdef-y += time.h
++unifdef-y += timex.h
++unifdef-y += tty.h
++unifdef-y += types.h
++unifdef-y += udf_fs_i.h
++unifdef-y += udp.h
++unifdef-y += uinput.h
++unifdef-y += uio.h
++unifdef-y += unistd.h
++unifdef-y += usb_ch9.h
++unifdef-y += usbdevice_fs.h
++unifdef-y += user.h
++unifdef-y += videodev2.h
++unifdef-y += videodev.h
++unifdef-y += wait.h
++unifdef-y += wanrouter.h
++unifdef-y += watchdog.h
++unifdef-y += xfrm.h
++unifdef-y += zftape.h
+
+-objhdr-y := version.h
++objhdr-y += version.h
+--- linux-2.6.18.orig/include/linux/byteorder/Kbuild
++++ linux-2.6.18/include/linux/byteorder/Kbuild
+@@ -1,2 +1,7 @@
+-unifdef-y += generic.h swabb.h swab.h
+-header-y += big_endian.h little_endian.h pdp_endian.h
++header-y += big_endian.h
++header-y += little_endian.h
++header-y += pdp_endian.h
++
++unifdef-y += generic.h
++unifdef-y += swabb.h
++unifdef-y += swab.h
+--- linux-2.6.18.orig/include/linux/dvb/Kbuild
++++ linux-2.6.18/include/linux/dvb/Kbuild
+@@ -1,2 +1,9 @@
+-header-y += ca.h frontend.h net.h osd.h version.h
+-unifdef-y := audio.h dmx.h video.h
++header-y += ca.h
++header-y += frontend.h
++header-y += net.h
++header-y += osd.h
++header-y += version.h
++
++unifdef-y += audio.h
++unifdef-y += dmx.h
++unifdef-y += video.h
+--- linux-2.6.18.orig/include/linux/netfilter/Kbuild
++++ linux-2.6.18/include/linux/netfilter/Kbuild
+@@ -1,11 +1,38 @@
+-header-y := nf_conntrack_sctp.h nf_conntrack_tuple_common.h \
+- nfnetlink_conntrack.h nfnetlink_log.h nfnetlink_queue.h \
+- xt_CLASSIFY.h xt_comment.h xt_connbytes.h xt_connmark.h \
+- xt_CONNMARK.h xt_conntrack.h xt_dccp.h xt_esp.h \
+- xt_helper.h xt_length.h xt_limit.h xt_mac.h xt_mark.h \
+- xt_MARK.h xt_multiport.h xt_NFQUEUE.h xt_pkttype.h \
+- xt_policy.h xt_realm.h xt_sctp.h xt_state.h xt_string.h \
+- xt_tcpmss.h xt_tcpudp.h xt_SECMARK.h xt_CONNSECMARK.h
++header-y += nf_conntrack_sctp.h
++header-y += nf_conntrack_tuple_common.h
++header-y += nfnetlink_conntrack.h
++header-y += nfnetlink_log.h
++header-y += nfnetlink_queue.h
++header-y += xt_CLASSIFY.h
++header-y += xt_comment.h
++header-y += xt_connbytes.h
++header-y += xt_connmark.h
++header-y += xt_CONNMARK.h
++header-y += xt_conntrack.h
++header-y += xt_dccp.h
++header-y += xt_esp.h
++header-y += xt_helper.h
++header-y += xt_length.h
++header-y += xt_limit.h
++header-y += xt_mac.h
++header-y += xt_mark.h
++header-y += xt_MARK.h
++header-y += xt_multiport.h
++header-y += xt_NFQUEUE.h
++header-y += xt_pkttype.h
++header-y += xt_policy.h
++header-y += xt_realm.h
++header-y += xt_sctp.h
++header-y += xt_state.h
++header-y += xt_string.h
++header-y += xt_tcpmss.h
++header-y += xt_tcpudp.h
++header-y += xt_SECMARK.h
++header-y += xt_CONNSECMARK.h
+
+-unifdef-y := nf_conntrack_common.h nf_conntrack_ftp.h \
+- nf_conntrack_tcp.h nfnetlink.h x_tables.h xt_physdev.h
++unifdef-y += nf_conntrack_common.h
++unifdef-y += nf_conntrack_ftp.h
++unifdef-y += nf_conntrack_tcp.h
++unifdef-y += nfnetlink.h
++unifdef-y += x_tables.h
++unifdef-y += xt_physdev.h
+--- linux-2.6.18.orig/include/linux/netfilter_arp/Kbuild
++++ linux-2.6.18/include/linux/netfilter_arp/Kbuild
+@@ -1,2 +1,3 @@
+-header-y := arpt_mangle.h
+-unifdef-y := arp_tables.h
++header-y += arpt_mangle.h
++
++unifdef-y += arp_tables.h
+--- linux-2.6.18.orig/include/linux/netfilter_bridge/Kbuild
++++ linux-2.6.18/include/linux/netfilter_bridge/Kbuild
+@@ -1,4 +1,17 @@
+-header-y += ebt_among.h ebt_arp.h ebt_arpreply.h ebt_ip.h ebt_limit.h \
+- ebt_log.h ebt_mark_m.h ebt_mark_t.h ebt_nat.h ebt_pkttype.h \
+- ebt_redirect.h ebt_stp.h ebt_ulog.h ebt_vlan.h
+-unifdef-y := ebtables.h ebt_802_3.h
++header-y += ebt_among.h
++header-y += ebt_arp.h
++header-y += ebt_arpreply.h
++header-y += ebt_ip.h
++header-y += ebt_limit.h
++header-y += ebt_log.h
++header-y += ebt_mark_m.h
++header-y += ebt_mark_t.h
++header-y += ebt_nat.h
++header-y += ebt_pkttype.h
++header-y += ebt_redirect.h
++header-y += ebt_stp.h
++header-y += ebt_ulog.h
++header-y += ebt_vlan.h
++
++unifdef-y += ebtables.h
++unifdef-y += ebt_802_3.h
+--- linux-2.6.18.orig/include/linux/netfilter_ipv4/Kbuild
++++ linux-2.6.18/include/linux/netfilter_ipv4/Kbuild
+@@ -1,21 +1,63 @@
++header-y += ip_conntrack_helper.h
++header-y += ip_conntrack_helper_h323_asn1.h
++header-y += ip_conntrack_helper_h323_types.h
++header-y += ip_conntrack_protocol.h
++header-y += ip_conntrack_sctp.h
++header-y += ip_conntrack_tcp.h
++header-y += ip_conntrack_tftp.h
++header-y += ip_nat_pptp.h
++header-y += ipt_addrtype.h
++header-y += ipt_ah.h
++header-y += ipt_CLASSIFY.h
++header-y += ipt_CLUSTERIP.h
++header-y += ipt_comment.h
++header-y += ipt_connbytes.h
++header-y += ipt_connmark.h
++header-y += ipt_CONNMARK.h
++header-y += ipt_conntrack.h
++header-y += ipt_dccp.h
++header-y += ipt_dscp.h
++header-y += ipt_DSCP.h
++header-y += ipt_ecn.h
++header-y += ipt_ECN.h
++header-y += ipt_esp.h
++header-y += ipt_hashlimit.h
++header-y += ipt_helper.h
++header-y += ipt_iprange.h
++header-y += ipt_length.h
++header-y += ipt_limit.h
++header-y += ipt_LOG.h
++header-y += ipt_mac.h
++header-y += ipt_mark.h
++header-y += ipt_MARK.h
++header-y += ipt_multiport.h
++header-y += ipt_NFQUEUE.h
++header-y += ipt_owner.h
++header-y += ipt_physdev.h
++header-y += ipt_pkttype.h
++header-y += ipt_policy.h
++header-y += ipt_realm.h
++header-y += ipt_recent.h
++header-y += ipt_REJECT.h
++header-y += ipt_SAME.h
++header-y += ipt_sctp.h
++header-y += ipt_state.h
++header-y += ipt_string.h
++header-y += ipt_tcpmss.h
++header-y += ipt_TCPMSS.h
++header-y += ipt_tos.h
++header-y += ipt_TOS.h
++header-y += ipt_ttl.h
++header-y += ipt_TTL.h
++header-y += ipt_ULOG.h
+
+-header-y := ip_conntrack_helper.h ip_conntrack_helper_h323_asn1.h \
+- ip_conntrack_helper_h323_types.h ip_conntrack_protocol.h \
+- ip_conntrack_sctp.h ip_conntrack_tcp.h ip_conntrack_tftp.h \
+- ip_nat_pptp.h ipt_addrtype.h ipt_ah.h \
+- ipt_CLASSIFY.h ipt_CLUSTERIP.h ipt_comment.h \
+- ipt_connbytes.h ipt_connmark.h ipt_CONNMARK.h \
+- ipt_conntrack.h ipt_dccp.h ipt_dscp.h ipt_DSCP.h ipt_ecn.h \
+- ipt_ECN.h ipt_esp.h ipt_hashlimit.h ipt_helper.h \
+- ipt_iprange.h ipt_length.h ipt_limit.h ipt_LOG.h ipt_mac.h \
+- ipt_mark.h ipt_MARK.h ipt_multiport.h ipt_NFQUEUE.h \
+- ipt_owner.h ipt_physdev.h ipt_pkttype.h ipt_policy.h \
+- ipt_realm.h ipt_recent.h ipt_REJECT.h ipt_SAME.h \
+- ipt_sctp.h ipt_state.h ipt_string.h ipt_tcpmss.h \
+- ipt_TCPMSS.h ipt_tos.h ipt_TOS.h ipt_ttl.h ipt_TTL.h \
+- ipt_ULOG.h
+-
+-unifdef-y := ip_conntrack.h ip_conntrack_h323.h ip_conntrack_irc.h \
+- ip_conntrack_pptp.h ip_conntrack_proto_gre.h \
+- ip_conntrack_tuple.h ip_nat.h ip_nat_rule.h ip_queue.h \
+- ip_tables.h
++unifdef-y += ip_conntrack.h
++unifdef-y += ip_conntrack_h323.h
++unifdef-y += ip_conntrack_irc.h
++unifdef-y += ip_conntrack_pptp.h
++unifdef-y += ip_conntrack_proto_gre.h
++unifdef-y += ip_conntrack_tuple.h
++unifdef-y += ip_nat.h
++unifdef-y += ip_nat_rule.h
++unifdef-y += ip_queue.h
++unifdef-y += ip_tables.h
+--- linux-2.6.18.orig/include/linux/netfilter_ipv6/Kbuild
++++ linux-2.6.18/include/linux/netfilter_ipv6/Kbuild
+@@ -1,6 +1,21 @@
+-header-y += ip6t_HL.h ip6t_LOG.h ip6t_MARK.h ip6t_REJECT.h ip6t_ah.h \
+- ip6t_esp.h ip6t_frag.h ip6t_hl.h ip6t_ipv6header.h \
+- ip6t_length.h ip6t_limit.h ip6t_mac.h ip6t_mark.h \
+- ip6t_multiport.h ip6t_opts.h ip6t_owner.h ip6t_policy.h \
+- ip6t_physdev.h ip6t_rt.h
+-unifdef-y := ip6_tables.h
++header-y += ip6t_HL.h
++header-y += ip6t_LOG.h
++header-y += ip6t_MARK.h
++header-y += ip6t_REJECT.h
++header-y += ip6t_ah.h
++header-y += ip6t_esp.h
++header-y += ip6t_frag.h
++header-y += ip6t_hl.h
++header-y += ip6t_ipv6header.h
++header-y += ip6t_length.h
++header-y += ip6t_limit.h
++header-y += ip6t_mac.h
++header-y += ip6t_mark.h
++header-y += ip6t_multiport.h
++header-y += ip6t_opts.h
++header-y += ip6t_owner.h
++header-y += ip6t_policy.h
++header-y += ip6t_physdev.h
++header-y += ip6t_rt.h
++
++unifdef-y += ip6_tables.h
+--- linux-2.6.18.orig/include/linux/nfsd/Kbuild
++++ linux-2.6.18/include/linux/nfsd/Kbuild
+@@ -1,2 +1,7 @@
+-unifdef-y := const.h export.h stats.h syscall.h nfsfh.h debug.h auth.h
+-
++unifdef-y += const.h
++unifdef-y += export.h
++unifdef-y += stats.h
++unifdef-y += syscall.h
++unifdef-y += nfsfh.h
++unifdef-y += debug.h
++unifdef-y += auth.h
+--- linux-2.6.18.orig/include/linux/raid/Kbuild
++++ linux-2.6.18/include/linux/raid/Kbuild
+@@ -1 +1,2 @@
+-header-y += md_p.h md_u.h
++header-y += md_p.h
++header-y += md_u.h
+--- linux-2.6.18.orig/include/linux/sunrpc/Kbuild
++++ linux-2.6.18/include/linux/sunrpc/Kbuild
+@@ -1 +1 @@
+-unifdef-y := debug.h
++unifdef-y += debug.h
+--- linux-2.6.18.orig/include/linux/tc_act/Kbuild
++++ linux-2.6.18/include/linux/tc_act/Kbuild
+@@ -1 +1,4 @@
+-header-y += tc_gact.h tc_ipt.h tc_mirred.h tc_pedit.h
++header-y += tc_gact.h
++header-y += tc_ipt.h
++header-y += tc_mirred.h
++header-y += tc_pedit.h
+--- linux-2.6.18.orig/include/linux/tc_ematch/Kbuild
++++ linux-2.6.18/include/linux/tc_ematch/Kbuild
+@@ -1 +1,4 @@
+-headers-y := tc_em_cmp.h tc_em_meta.h tc_em_nbyte.h tc_em_text.h
++header-y += tc_em_cmp.h
++header-y += tc_em_meta.h
++header-y += tc_em_nbyte.h
++header-y += tc_em_text.h
+--- linux-2.6.18.orig/include/mtd/Kbuild
++++ linux-2.6.18/include/mtd/Kbuild
+@@ -1,2 +1,6 @@
+-unifdef-y := mtd-abi.h
+-header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
++header-y += inftl-user.h
++header-y += jffs2-user.h
++header-y += mtd-user.h
++header-y += nftl-user.h
++
++unifdef-y += mtd-abi.h
+--- linux-2.6.18.orig/include/rdma/Kbuild
++++ linux-2.6.18/include/rdma/Kbuild
+@@ -1 +1 @@
+-header-y := ib_user_mad.h
++header-y += ib_user_mad.h
+--- linux-2.6.18.orig/include/scsi/Kbuild
++++ linux-2.6.18/include/scsi/Kbuild
+@@ -1,2 +1,4 @@
+ header-y += scsi.h
+-unifdef-y := scsi_ioctl.h sg.h
++
++unifdef-y += scsi_ioctl.h
++unifdef-y += sg.h
+--- linux-2.6.18.orig/include/sound/Kbuild
++++ linux-2.6.18/include/sound/Kbuild
+@@ -1,2 +1,10 @@
+-header-y := asound_fm.h hdsp.h hdspm.h sfnt_info.h sscape_ioctl.h
+-unifdef-y := asequencer.h asound.h emu10k1.h sb16_csp.h
++header-y += asound_fm.h
++header-y += hdsp.h
++header-y += hdspm.h
++header-y += sfnt_info.h
++header-y += sscape_ioctl.h
++
++unifdef-y += asequencer.h
++unifdef-y += asound.h
++unifdef-y += emu10k1.h
++unifdef-y += sb16_csp.h
+--- linux-2.6.18.orig/include/video/Kbuild
++++ linux-2.6.18/include/video/Kbuild
+@@ -1 +1 @@
+-unifdef-y := sisfb.h
++unifdef-y += sisfb.h
--- /dev/null
+From 6ff6340abeaaf1a15587c87dac3e56754778cc7a Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 08:34:39 +0100
+Subject: [PATCH 2/15] [HEADERS] Fix ARM 'make headers_check'
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+Sanitise the ARM headers exported to userspace.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-arm/elf.h | 18 ++++++++----------
+ include/asm-arm/page.h | 4 ++--
+ 2 files changed, 10 insertions(+), 12 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-arm/elf.h
++++ linux-2.6.18/include/asm-arm/elf.h
+@@ -8,9 +8,6 @@
+
+ #include <asm/ptrace.h>
+ #include <asm/user.h>
+-#ifdef __KERNEL
+-#include <asm/procinfo.h>
+-#endif
+
+ typedef unsigned long elf_greg_t;
+ typedef unsigned long elf_freg_t[3];
+@@ -32,11 +29,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGR
+ typedef struct user_fp elf_fpregset_t;
+
+ /*
+- * This is used to ensure we don't load something for the wrong architecture.
+- */
+-#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
+-
+-/*
+ * These are used to set parameters in the core dumps.
+ */
+ #define ELF_CLASS ELFCLASS32
+@@ -47,6 +39,14 @@ typedef struct user_fp elf_fpregset_t;
+ #endif
+ #define ELF_ARCH EM_ARM
+
++#ifdef __KERNEL__
++#include <asm/procinfo.h>
++
++/*
++ * This is used to ensure we don't load something for the wrong architecture.
++ */
++#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
++
+ #define USE_ELF_CORE_DUMP
+ #define ELF_EXEC_PAGESIZE 4096
+
+@@ -83,8 +83,6 @@ typedef struct user_fp elf_fpregset_t;
+ extern char elf_platform[];
+ #define ELF_PLATFORM (elf_platform)
+
+-#ifdef __KERNEL__
+-
+ /*
+ * 32-bit code is always OK. Some cpus can do 26-bit, some can't.
+ */
+--- linux-2.6.18.orig/include/asm-arm/page.h
++++ linux-2.6.18/include/asm-arm/page.h
+@@ -11,13 +11,13 @@
+ #define _ASMARM_PAGE_H
+
+
++#ifdef __KERNEL__
++
+ /* PAGE_SHIFT determines the page size */
+ #define PAGE_SHIFT 12
+ #define PAGE_SIZE (1UL << PAGE_SHIFT)
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+
+-#ifdef __KERNEL__
+-
+ /* to align the pointer to the (next) page boundary */
+ #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+
--- /dev/null
+From b5233d0704c9a6147ebbfabc576d1638b3ac5274 Mon Sep 17 00:00:00 2001
+From: Paul Mundt <lethal@linux-sh.org>
+Date: Wed, 20 Sep 2006 03:25:34 +0900
+Subject: [PATCH 3/15] Fix 'make headers_check' on sh
+
+From: Paul Mundt <lethal@linux-sh.org>
+
+Cleanup for user headers, as noted:
+
+asm-sh/page.h requires asm-generic/memory_model.h, which does not exist in exported headers
+asm-sh/ptrace.h requires asm/ubc.h, which does not exist in exported headers
+
+Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/sh/kernel/process.c | 1 +
+ include/asm-sh/page.h | 3 +--
+ include/asm-sh/ptrace.h | 2 --
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+--- linux-2.6.18.orig/arch/sh/kernel/process.c
++++ linux-2.6.18/arch/sh/kernel/process.c
+@@ -26,6 +26,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/mmu_context.h>
+ #include <asm/elf.h>
++#include <asm/ubc.h>
+
+ static int hlt_counter=0;
+
+--- linux-2.6.18.orig/include/asm-sh/page.h
++++ linux-2.6.18/include/asm-sh/page.h
+@@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; }
+ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
+ #endif /* __ASM_SH_PAGE_H */
+--- linux-2.6.18.orig/include/asm-sh/ptrace.h
++++ linux-2.6.18/include/asm-sh/ptrace.h
+@@ -1,8 +1,6 @@
+ #ifndef __ASM_SH_PTRACE_H
+ #define __ASM_SH_PTRACE_H
+
+-#include <asm/ubc.h>
+-
+ /*
+ * Copyright (C) 1999, 2000 Niibe Yutaka
+ *
--- /dev/null
+From 029669da25efa18ee4b8911e694fdcf4a11c8cbe Mon Sep 17 00:00:00 2001
+From: Paul Mundt <lethal@linux-sh.org>
+Date: Wed, 20 Sep 2006 03:27:17 +0900
+Subject: [PATCH 4/15] Fix 'make headers_check' on sh64
+
+From: Paul Mundt <lethal@linux-sh.org>
+
+Cleanup for user headers, as noted:
+
+asm-sh64/page.h requires asm-generic/memory_model.h, which does not exist in exported headers
+asm-sh64/shmparam.h requires asm/cache.h, which does not exist in exported headers
+asm-sh64/signal.h requires asm/processor.h, which does not exist in exported headers
+asm-sh64/user.h requires asm/processor.h, which does not exist in exported headers
+
+Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-sh64/page.h | 3 +--
+ include/asm-sh64/shmparam.h | 16 ++++------------
+ include/asm-sh64/signal.h | 1 -
+ include/asm-sh64/user.h | 1 -
+ 4 files changed, 5 insertions(+), 16 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-sh64/page.h
++++ linux-2.6.18/include/asm-sh64/page.h
+@@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; }
+ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
+ #endif /* __ASM_SH64_PAGE_H */
+--- linux-2.6.18.orig/include/asm-sh64/shmparam.h
++++ linux-2.6.18/include/asm-sh64/shmparam.h
+@@ -2,19 +2,11 @@
+ #define __ASM_SH64_SHMPARAM_H
+
+ /*
+- * This file is subject to the terms and conditions of the GNU General Public
+- * License. See the file "COPYING" in the main directory of this archive
+- * for more details.
+- *
+- * include/asm-sh64/shmparam.h
+- *
+- * Copyright (C) 2000, 2001 Paolo Alberelli
+- *
++ * Set this to a sensible safe default, we'll work out the specifics for the
++ * align mask from the cache descriptor at run-time.
+ */
++#define SHMLBA 0x4000
+
+-#include <asm/cache.h>
+-
+-/* attach addr a multiple of this */
+-#define SHMLBA (cpu_data->dcache.sets * L1_CACHE_BYTES)
++#define __ARCH_FORCE_SHMLBA
+
+ #endif /* __ASM_SH64_SHMPARAM_H */
+--- linux-2.6.18.orig/include/asm-sh64/signal.h
++++ linux-2.6.18/include/asm-sh64/signal.h
+@@ -13,7 +13,6 @@
+ */
+
+ #include <linux/types.h>
+-#include <asm/processor.h>
+
+ /* Avoid too many header ordering problems. */
+ struct siginfo;
+--- linux-2.6.18.orig/include/asm-sh64/user.h
++++ linux-2.6.18/include/asm-sh64/user.h
+@@ -13,7 +13,6 @@
+ */
+
+ #include <linux/types.h>
+-#include <asm/processor.h>
+ #include <asm/ptrace.h>
+ #include <asm/page.h>
+
--- /dev/null
+From 47dbec79d1b9ce9e80bed932f345adc92049f05d Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Sun, 17 Sep 2006 08:39:39 +0100
+Subject: [PATCH 5/15] Fix 'make headers_check' on m32r
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+> asm-m32r/page.h requires asm-generic/memory_model.h, which does not exist
+> asm-m32r/ptrace.h requires asm/m32r.h, which does not exist
+> asm-m32r/signal.h requires linux/linkage.h, which does not exist
+> asm-m32r/unistd.h requires asm/syscall.h, which does not exist
+> asm-m32r/user.h requires asm/processor.h, which does not exist
+
+Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-m32r/page.h | 3 +--
+ include/asm-m32r/ptrace.h | 4 ++--
+ include/asm-m32r/signal.h | 1 -
+ include/asm-m32r/unistd.h | 4 ++--
+ include/asm-m32r/user.h | 1 -
+ 5 files changed, 5 insertions(+), 8 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-m32r/page.h
++++ linux-2.6.18/include/asm-m32r/page.h
+@@ -87,10 +87,9 @@ typedef struct { unsigned long pgprot; }
+
+ #define devmem_is_allowed(x) 1
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
+ #endif /* _ASM_M32R_PAGE_H */
+
+--- linux-2.6.18.orig/include/asm-m32r/ptrace.h
++++ linux-2.6.18/include/asm-m32r/ptrace.h
+@@ -12,8 +12,6 @@
+ * Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org>
+ */
+
+-#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
+-
+ /* 0 - 13 are integer registers (general purpose registers). */
+ #define PT_R4 0
+ #define PT_R5 1
+@@ -140,6 +138,8 @@ struct pt_regs {
+
+ #ifdef __KERNEL__
+
++#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
++
+ #define __ARCH_SYS_PTRACE 1
+
+ #if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)
+--- linux-2.6.18.orig/include/asm-m32r/signal.h
++++ linux-2.6.18/include/asm-m32r/signal.h
+@@ -6,7 +6,6 @@
+ /* orig : i386 2.4.18 */
+
+ #include <linux/types.h>
+-#include <linux/linkage.h>
+ #include <linux/time.h>
+ #include <linux/compiler.h>
+
+--- linux-2.6.18.orig/include/asm-m32r/unistd.h
++++ linux-2.6.18/include/asm-m32r/unistd.h
+@@ -3,8 +3,6 @@
+
+ /* $Id$ */
+
+-#include <asm/syscall.h> /* SYSCALL_* */
+-
+ /*
+ * This file contains the system call numbers.
+ */
+@@ -303,6 +301,8 @@
+ * <asm-m32r/errno.h>
+ */
+
++#include <asm/syscall.h> /* SYSCALL_* */
++
+ #define __syscall_return(type, res) \
+ do { \
+ if ((unsigned long)(res) >= (unsigned long)(-(124 + 1))) { \
+--- linux-2.6.18.orig/include/asm-m32r/user.h
++++ linux-2.6.18/include/asm-m32r/user.h
+@@ -8,7 +8,6 @@
+ */
+
+ #include <linux/types.h>
+-#include <asm/processor.h>
+ #include <asm/ptrace.h>
+ #include <asm/page.h>
+
--- /dev/null
+From 09087a1a8722fac30b1969a4a542cde064af13f8 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 08:48:27 +0100
+Subject: [PATCH 6/15] Fix exported headers for SPARC, SPARC64
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+Mostly removing files which have no business being used in userspace.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-sparc/Kbuild | 7 -------
+ include/asm-sparc/page.h | 8 ++++----
+ include/asm-sparc64/Kbuild | 5 +----
+ include/asm-sparc64/page.h | 9 ++++-----
+ include/asm-sparc64/shmparam.h | 2 ++
+ 5 files changed, 11 insertions(+), 20 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-sparc/Kbuild
++++ linux-2.6.18/include/asm-sparc/Kbuild
+@@ -2,20 +2,13 @@ include include/asm-generic/Kbuild.asm
+
+ header-y += apc.h
+ header-y += asi.h
+-header-y += auxio.h
+ header-y += bpp.h
+-header-y += head.h
+-header-y += ipc.h
+ header-y += jsflash.h
+ header-y += openpromio.h
+-header-y += pbm.h
+ header-y += pconf.h
+-header-y += pgtsun4.h
+ header-y += reg.h
+ header-y += traps.h
+-header-y += turbosparc.h
+ header-y += vfc_ioctls.h
+-header-y += winmacro.h
+
+ unifdef-y += fbio.h
+ unifdef-y += perfctr.h
+--- linux-2.6.18.orig/include/asm-sparc/page.h
++++ linux-2.6.18/include/asm-sparc/page.h
+@@ -8,6 +8,8 @@
+ #ifndef _SPARC_PAGE_H
+ #define _SPARC_PAGE_H
+
++#ifdef __KERNEL__
++
+ #ifdef CONFIG_SUN4
+ #define PAGE_SHIFT 13
+ #else
+@@ -21,8 +23,6 @@
+ #endif
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+
+-#ifdef __KERNEL__
+-
+ #include <asm/btfixup.h>
+
+ #ifndef __ASSEMBLY__
+@@ -160,9 +160,9 @@ extern unsigned long pfn_base;
+ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
++
+ #endif /* _SPARC_PAGE_H */
+--- linux-2.6.18.orig/include/asm-sparc64/Kbuild
++++ linux-2.6.18/include/asm-sparc64/Kbuild
+@@ -8,15 +8,12 @@ header-y += apb.h
+ header-y += asi.h
+ header-y += bbc.h
+ header-y += bpp.h
++header-y += const.h
+ header-y += display7seg.h
+ header-y += envctrl.h
+-header-y += floppy.h
+ header-y += ipc.h
+-header-y += kdebug.h
+-header-y += mostek.h
+ header-y += openprom.h
+ header-y += openpromio.h
+-header-y += parport.h
+ header-y += pconf.h
+ header-y += psrcompat.h
+ header-y += pstate.h
+--- linux-2.6.18.orig/include/asm-sparc64/page.h
++++ linux-2.6.18/include/asm-sparc64/page.h
+@@ -3,6 +3,8 @@
+ #ifndef _SPARC64_PAGE_H
+ #define _SPARC64_PAGE_H
+
++#ifdef __KERNEL__
++
+ #include <asm/const.h>
+
+ #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
+@@ -27,8 +29,6 @@
+ #define DCACHE_ALIASING_POSSIBLE
+ #endif
+
+-#ifdef __KERNEL__
+-
+ #if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
+ #define HPAGE_SHIFT 22
+ #elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
+@@ -141,8 +141,7 @@ typedef unsigned long pgprot_t;
+ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+-#endif /* !(__KERNEL__) */
+-
+ #include <asm-generic/page.h>
+
+-#endif /* !(_SPARC64_PAGE_H) */
++#endif /* __KERNEL__ */
++#endif /* _SPARC64_PAGE_H */
+--- linux-2.6.18.orig/include/asm-sparc64/shmparam.h
++++ linux-2.6.18/include/asm-sparc64/shmparam.h
+@@ -1,6 +1,7 @@
+ /* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */
+ #ifndef _ASMSPARC64_SHMPARAM_H
+ #define _ASMSPARC64_SHMPARAM_H
++#ifdef __KERNEL__
+
+ #include <asm/spitfire.h>
+
+@@ -8,4 +9,5 @@
+ /* attach addr a multiple of this */
+ #define SHMLBA ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)
+
++#endif /* __KERNEL__ */
+ #endif /* _ASMSPARC64_SHMPARAM_H */
--- /dev/null
+From 5daf3033aa4fc5ec0535816d8a8e94874160482e Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 08:50:36 +0100
+Subject: [PATCH 7/15] Fix m68knommu exported headers
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+Just clean up asm/page.h
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-m68knommu/page.h | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-m68knommu/page.h
++++ linux-2.6.18/include/asm-m68knommu/page.h
+@@ -1,6 +1,7 @@
+ #ifndef _M68KNOMMU_PAGE_H
+ #define _M68KNOMMU_PAGE_H
+
++#ifdef __KERNEL__
+
+ /* PAGE_SHIFT determines the page size */
+
+@@ -8,8 +9,6 @@
+ #define PAGE_SIZE (1UL << PAGE_SHIFT)
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+
+-#ifdef __KERNEL__
+-
+ #include <asm/setup.h>
+
+ #ifndef __ASSEMBLY__
+@@ -76,8 +75,8 @@ extern unsigned long memory_end;
+
+ #endif /* __ASSEMBLY__ */
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
++
+ #endif /* _M68KNOMMU_PAGE_H */
--- /dev/null
+From 0000f0b1bc9aa340356a8dcdb9e8b1dbbaf0afcb Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 08:51:43 +0100
+Subject: [PATCH 8/15] Fix H8300 exported headers.
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+Just clean up asm/page.h
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-h8300/page.h | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-h8300/page.h
++++ linux-2.6.18/include/asm-h8300/page.h
+@@ -1,6 +1,7 @@
+ #ifndef _H8300_PAGE_H
+ #define _H8300_PAGE_H
+
++#ifdef __KERNEL__
+
+ /* PAGE_SHIFT determines the page size */
+
+@@ -8,8 +9,6 @@
+ #define PAGE_SIZE (1UL << PAGE_SHIFT)
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+
+-#ifdef __KERNEL__
+-
+ #include <asm/setup.h>
+
+ #ifndef __ASSEMBLY__
+@@ -76,9 +75,9 @@ extern unsigned long memory_end;
+
+ #endif /* __ASSEMBLY__ */
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
++
+ #endif /* _H8300_PAGE_H */
--- /dev/null
+From cb16da6a71924772dc4580c16541dece2b9a8472 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 08:54:44 +0100
+Subject: [PATCH 9/15] Remove ARM26 header export.
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+We ought to be able to use ARM headers; no need for special ARM26 version.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-arm26/Kbuild | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- linux-2.6.18.orig/include/asm-arm26/Kbuild
++++ /dev/null
+@@ -1 +0,0 @@
+-include include/asm-generic/Kbuild.asm
--- /dev/null
+From d28d1f10f99f8ab2fe2bd06c3d22397d0ba08687 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 08:55:28 +0100
+Subject: [PATCH 10/15] Remove UML header export
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+No need for UML to export headers for userspace to build against.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-um/Kbuild | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- linux-2.6.18.orig/include/asm-um/Kbuild
++++ /dev/null
+@@ -1 +0,0 @@
+-include include/asm-generic/Kbuild.asm
--- /dev/null
+From f17b7bad396c8f748620f54a88754a1f5af02c8a Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 09:01:45 +0100
+Subject: [PATCH 11/15] Don't advertise (or allow) headers_{install,check} where inappropriate.
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+For architectures which don't have the include/asm-$(ARCH)/Kbuild file,
+like ARM26, UM, etc.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ Makefile | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- linux-2.6.18.orig/Makefile
++++ linux-2.6.18/Makefile
+@@ -894,6 +894,9 @@ export INSTALL_HDR_PATH
+
+ PHONY += headers_install
+ headers_install: include/linux/version.h
++ @if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \
++ echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
++ exit 1 ; fi
+ $(Q)unifdef -Ux /dev/null
+ $(Q)rm -rf $(INSTALL_HDR_PATH)/include
+ $(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
+@@ -1076,13 +1079,17 @@ help:
+ @echo ' cscope - Generate cscope index'
+ @echo ' kernelrelease - Output the release version string'
+ @echo ' kernelversion - Output the version stored in Makefile'
+- @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'
++ @if [ -r include/asm-$(ARCH)/Kbuild ]; then \
++ echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
++ fi
+ @echo ' (default: $(INSTALL_HDR_PATH))'
+ @echo ''
+ @echo 'Static analysers'
+ @echo ' checkstack - Generate a list of stack hogs'
+ @echo ' namespacecheck - Name space analysis on compiled kernel'
+- @echo ' headers_check - Sanity check on exported headers'
++ @if [ -r include/asm-$(ARCH)/Kbuild ]; then \
++ echo ' headers_check - Sanity check on exported headers'; \
++ fi
+ @echo ''
+ @echo 'Kernel packaging:'
+ @$(MAKE) $(build)=$(package-dir) help
--- /dev/null
+From 2a1b181eff32f497f285fcfc1e771ec469205908 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 09:05:25 +0100
+Subject: [PATCH 12/15] Fix v850 exported headers
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-v850/page.h | 7 ++++---
+ include/asm-v850/param.h | 4 ++--
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-v850/page.h
++++ linux-2.6.18/include/asm-v850/page.h
+@@ -14,6 +14,8 @@
+ #ifndef __V850_PAGE_H__
+ #define __V850_PAGE_H__
+
++#ifdef __KERNEL__
++
+ #include <asm/machdep.h>
+
+
+@@ -32,7 +34,6 @@
+ #endif
+
+
+-#ifdef __KERNEL__
+ #ifndef __ASSEMBLY__
+
+ #define STRICT_MM_TYPECHECKS
+@@ -122,9 +123,9 @@ typedef unsigned long pgprot_t;
+ #define __va(x) ((void *)__phys_to_virt ((unsigned long)(x)))
+
+
+-#endif /* KERNEL */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* KERNEL */
++
+ #endif /* __V850_PAGE_H__ */
+--- linux-2.6.18.orig/include/asm-v850/param.h
++++ linux-2.6.18/include/asm-v850/param.h
+@@ -14,8 +14,6 @@
+ #ifndef __V850_PARAM_H__
+ #define __V850_PARAM_H__
+
+-#include <asm/machdep.h> /* For HZ */
+-
+ #define EXEC_PAGESIZE 4096
+
+ #ifndef NOGROUP
+@@ -25,6 +23,8 @@
+ #define MAXHOSTNAMELEN 64 /* max length of hostname */
+
+ #ifdef __KERNEL__
++#include <asm/machdep.h> /* For HZ */
++
+ # define USER_HZ 100
+ # define CLOCKS_PER_SEC USER_HZ
+ #endif
--- /dev/null
+From ed9526b0d342a1c08a19f880c3f0c1d0fec4e8db Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 21 Sep 2006 09:33:55 +0100
+Subject: [PATCH 13/15] Clean up exported headers on CRIS
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+This fixes most of the issues with exported headers on CRIS, although
+we do still need to deal with the asm/arch symlink.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-cris/Kbuild | 4 ++++
+ include/asm-cris/arch-v10/Kbuild | 2 ++
+ include/asm-cris/arch-v32/Kbuild | 2 ++
+ include/asm-cris/byteorder.h | 3 ++-
+ include/asm-cris/elf.h | 8 +++++---
+ include/asm-cris/page.h | 8 ++++----
+ include/asm-cris/posix_types.h | 9 +++------
+ include/asm-cris/unistd.h | 4 +---
+ 8 files changed, 23 insertions(+), 17 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-cris/Kbuild
++++ linux-2.6.18/include/asm-cris/Kbuild
+@@ -1 +1,5 @@
+ include include/asm-generic/Kbuild.asm
++
++header-y += arch-v10/ arch-v32/
++
++unifdef-y += rs485.h
+--- /dev/null
++++ linux-2.6.18/include/asm-cris/arch-v10/Kbuild
+@@ -0,0 +1,2 @@
++header-y += ptrace.h
++header-y += user.h
+--- /dev/null
++++ linux-2.6.18/include/asm-cris/arch-v32/Kbuild
+@@ -0,0 +1,2 @@
++header-y += ptrace.h
++header-y += user.h
+--- linux-2.6.18.orig/include/asm-cris/byteorder.h
++++ linux-2.6.18/include/asm-cris/byteorder.h
+@@ -3,14 +3,15 @@
+
+ #ifdef __GNUC__
+
++#ifdef __KERNEL__
+ #include <asm/arch/byteorder.h>
+
+ /* defines are necessary because the other files detect the presence
+ * of a defined __arch_swab32, not an inline
+ */
+-
+ #define __arch__swab32(x) ___arch__swab32(x)
+ #define __arch__swab16(x) ___arch__swab16(x)
++#endif /* __KERNEL__ */
+
+ #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+ # define __BYTEORDER_HAS_U64__
+--- linux-2.6.18.orig/include/asm-cris/elf.h
++++ linux-2.6.18/include/asm-cris/elf.h
+@@ -5,7 +5,6 @@
+ * ELF register definitions..
+ */
+
+-#include <asm/arch/elf.h>
+ #include <asm/user.h>
+
+ #define R_CRIS_NONE 0
+@@ -46,6 +45,9 @@ typedef unsigned long elf_fpregset_t;
+ #define ELF_DATA ELFDATA2LSB
+ #define ELF_ARCH EM_CRIS
+
++#ifdef __KERNEL__
++#include <asm/arch/elf.h>
++
+ /* The master for these definitions is {binutils}/include/elf/cris.h: */
+ /* User symbols in this file have a leading underscore. */
+ #define EF_CRIS_UNDERSCORE 0x00000001
+@@ -87,8 +89,8 @@ typedef unsigned long elf_fpregset_t;
+
+ #define ELF_PLATFORM (NULL)
+
+-#ifdef __KERNEL__
+ #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
+-#endif
++
++#endif /* __KERNEL__ */
+
+ #endif
+--- linux-2.6.18.orig/include/asm-cris/page.h
++++ linux-2.6.18/include/asm-cris/page.h
+@@ -1,6 +1,8 @@
+ #ifndef _CRIS_PAGE_H
+ #define _CRIS_PAGE_H
+
++#ifdef __KERNEL__
++
+ #include <asm/arch/page.h>
+
+ /* PAGE_SHIFT determines the page size */
+@@ -12,8 +14,6 @@
+ #endif
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+
+-#ifdef __KERNEL__
+-
+ #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
+ #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE)
+
+@@ -73,10 +73,10 @@ typedef struct { unsigned long pgprot; }
+ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+-#endif /* __KERNEL__ */
+-
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
+
++#endif /* __KERNEL__ */
++
+ #endif /* _CRIS_PAGE_H */
+
+--- linux-2.6.18.orig/include/asm-cris/posix_types.h
++++ linux-2.6.18/include/asm-cris/posix_types.h
+@@ -6,8 +6,6 @@
+ #ifndef __ARCH_CRIS_POSIX_TYPES_H
+ #define __ARCH_CRIS_POSIX_TYPES_H
+
+-#include <asm/bitops.h>
+-
+ /*
+ * This file is generally used by user-level software, so you need to
+ * be a little careful about namespace pollution etc. Also, we cannot
+@@ -53,9 +51,8 @@ typedef struct {
+ #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
+ } __kernel_fsid_t;
+
+-/* should this ifdef be here ? */
+-
+-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
++#ifdef __KERNEL__
++#include <asm/bitops.h>
+
+ #undef __FD_SET
+ #define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp))
+@@ -69,6 +66,6 @@ typedef struct {
+ #undef __FD_ZERO
+ #define __FD_ZERO(fdsetp) memset((void *)(fdsetp), 0, __FDSET_LONGS << 2)
+
+-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
++#endif /* __KERNEL__ */
+
+ #endif /* __ARCH_CRIS_POSIX_TYPES_H */
+--- linux-2.6.18.orig/include/asm-cris/unistd.h
++++ linux-2.6.18/include/asm-cris/unistd.h
+@@ -1,8 +1,6 @@
+ #ifndef _ASM_CRIS_UNISTD_H_
+ #define _ASM_CRIS_UNISTD_H_
+
+-#include <asm/arch/unistd.h>
+-
+ /*
+ * This file contains the system call numbers, and stub macros for libc.
+ */
+@@ -299,6 +297,7 @@
+
+ #define NR_syscalls 289
+
++#include <asm/arch/unistd.h>
+
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+@@ -322,7 +321,6 @@
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+-#endif
+
+ #ifdef __KERNEL_SYSCALLS__
+
--- /dev/null
+From 1694176a210189312e31b083bac1e1688981219a Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Fri, 22 Sep 2006 08:00:42 +0100
+Subject: [PATCH 14/15] Remove offsetof() from user-visible <linux/stddef.h>
+
+From: David Woodhouse <dwmw2@infradead.org>
+
+It's not used by anything user-visible, and it make g++ unhappy.
+
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ include/linux/Kbuild | 2 +-
+ include/linux/stddef.h | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- linux-2.6.18.orig/include/linux/Kbuild
++++ linux-2.6.18/include/linux/Kbuild
+@@ -143,7 +143,6 @@ header-y += snmp.h
+ header-y += sockios.h
+ header-y += som.h
+ header-y += sound.h
+-header-y += stddef.h
+ header-y += synclink.h
+ header-y += telephony.h
+ header-y += termios.h
+@@ -318,6 +317,7 @@ unifdef-y += sonet.h
+ unifdef-y += sonypi.h
+ unifdef-y += soundcard.h
+ unifdef-y += stat.h
++unifdef-y += stddef.h
+ unifdef-y += sysctl.h
+ unifdef-y += tcp.h
+ unifdef-y += time.h
+--- linux-2.6.18.orig/include/linux/stddef.h
++++ linux-2.6.18/include/linux/stddef.h
+@@ -10,11 +10,13 @@
+ #define NULL ((void *)0)
+ #endif
+
++#ifdef __KERNEL__
+ #undef offsetof
+ #ifdef __compiler_offsetof
+ #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
+ #else
+ #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+ #endif
++#endif /* __KERNEL__ */
+
+ #endif
--- /dev/null
+From 7d5bf7e36fa9b180dbeb1de0d72ffb6da71f6a1d Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd.bergmann@de.ibm.com>
+Date: Fri, 22 Sep 2006 08:40:40 +0100
+Subject: [PATCH 15/15] powerpc: fix building gdb against asm/ptrace.h
+
+From: Arnd Bergmann <arnd.bergmann@de.ibm.com>
+
+Ulrich Weigand found a bug with the current version of the
+asm-powerpc/ptrace.h that prevents building at least the
+SPU target version of gdb, since some ptrace opcodes are
+not defined.
+
+The problem seems to have originated in the merging of 32 and
+64 bit versions of that file, the problem is that some opcodes
+are only valid on 64 bit kernels, but are also used by 32 bit
+programs, so they can't depends on the __powerpc64__ symbol.
+
+Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
+Signed-off-by: David Woodhouse <dwmw2@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/asm-powerpc/ptrace.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+--- linux-2.6.18.orig/include/asm-powerpc/ptrace.h
++++ linux-2.6.18/include/asm-powerpc/ptrace.h
+@@ -215,12 +215,10 @@ do { \
+ #define PTRACE_GETVRREGS 18
+ #define PTRACE_SETVRREGS 19
+
+-#ifndef __powerpc64__
+ /* Get/set all the upper 32-bits of the SPE registers, accumulator, and
+ * spefscr, in one go */
+ #define PTRACE_GETEVRREGS 20
+ #define PTRACE_SETEVRREGS 21
+-#endif /* __powerpc64__ */
+
+ /*
+ * Get or set a debug register. The first 16 are DABR registers and the
+@@ -235,7 +233,6 @@ do { \
+ #define PPC_PTRACE_GETFPREGS 0x97 /* Get FPRs 0 - 31 */
+ #define PPC_PTRACE_SETFPREGS 0x96 /* Set FPRs 0 - 31 */
+
+-#ifdef __powerpc64__
+ /* Calls to trace a 64bit program from a 32bit program */
+ #define PPC_PTRACE_PEEKTEXT_3264 0x95
+ #define PPC_PTRACE_PEEKDATA_3264 0x94
+@@ -243,6 +240,5 @@ do { \
+ #define PPC_PTRACE_POKEDATA_3264 0x92
+ #define PPC_PTRACE_PEEKUSR_3264 0x91
+ #define PPC_PTRACE_POKEUSR_3264 0x90
+-#endif /* __powerpc64__ */
+
+ #endif /* _ASM_POWERPC_PTRACE_H */
netdrvr-lp486e-fix-typo.patch
sky2-tx-pause-bug-fix.patch
sky2-network-driver-device-ids.patch
+0001-HEADERS-One-line-per-header-in-Kbuild-files-to-reduce-conflicts.patch
+0002-HEADERS-Fix-ARM-make-headers_check.patch
+0003-Fix-make-headers_check-on-sh.patch
+0004-Fix-make-headers_check-on-sh64.patch
+0005-Fix-make-headers_check-on-m32r.patch
+0006-Fix-exported-headers-for-SPARC-SPARC64.patch
+0007-Fix-m68knommu-exported-headers.patch
+0008-Fix-H8300-exported-headers.patch
+0009-Remove-ARM26-header-export.patch
+0010-Remove-UML-header-export.patch
+0011-Don-t-advertise-or-allow-headers_-install-check-where-inappropriate.patch
+0012-Fix-v850-exported-headers.patch
+0013-Clean-up-exported-headers-on-CRIS.patch
+0014-Remove-offsetof-from-user-visible-linux-stddef.h.patch
+0015-powerpc-fix-building-gdb-against-asm-ptrace.h.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
