[kernel] r4966 - in people/waldi/linux-2.6: . debian debian/arch
debian/arch/alpha debian/arch/amd64 debian/arch/arm
debian/arch/hppa debian/arch/i386 debian/arch/ia64
debian/arch/m68k debian/arch/powerpc debian/arch/sparc
debian/bin debian/patches-debian debian/patches-debian/series
Bastian Blank
waldi at costa.debian.org
Sun Dec 4 11:44:35 UTC 2005
Author: waldi
Date: Sun Dec 4 11:44:32 2005
New Revision: 4966
Added:
people/waldi/linux-2.6/debian/arch/powerpc/modules
people/waldi/linux-2.6/debian/arch/powerpc/modules.README
people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc
people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc-miboot
people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc64
people/waldi/linux-2.6/debian/patches-debian/powerpc-arch-default-powerpc.patch
people/waldi/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1
Removed:
people/waldi/linux-2.6/debian/patches-debian/2.6.14.1.patch
people/waldi/linux-2.6/debian/patches-debian/2.6.14.2.patch
people/waldi/linux-2.6/debian/patches-debian/alpha-compile-fix.patch
people/waldi/linux-2.6/debian/patches-debian/amd64-int3-fix.patch
people/waldi/linux-2.6/debian/patches-debian/m68k-42_dma.patch
people/waldi/linux-2.6/debian/patches-debian/m68k-arch.patch
people/waldi/linux-2.6/debian/patches-debian/m68k-drivers.patch
people/waldi/linux-2.6/debian/patches-debian/m68k-include-m68k.patch
people/waldi/linux-2.6/debian/patches-debian/m68k-kernel.patch
people/waldi/linux-2.6/debian/patches-debian/net-ipconntrack-nat-fix.patch
people/waldi/linux-2.6/debian/patches-debian/net-nf_queue-oops.patch
people/waldi/linux-2.6/debian/patches-debian/powerpc-apus-todo.patch
people/waldi/linux-2.6/debian/patches-debian/powerpc-g4-l2-flush-errata.patch
people/waldi/linux-2.6/debian/patches-debian/powerpc-serial-of.patch
people/waldi/linux-2.6/debian/patches-debian/qla2xxx-removed.patch
people/waldi/linux-2.6/debian/patches-debian/series/2.6.14-1
people/waldi/linux-2.6/debian/patches-debian/series/2.6.14-2
people/waldi/linux-2.6/debian/patches-debian/series/2.6.14-3
Modified:
people/waldi/linux-2.6/ (props changed)
people/waldi/linux-2.6/debian/README.Debian
people/waldi/linux-2.6/debian/arch/alpha/config
people/waldi/linux-2.6/debian/arch/alpha/config.alpha-generic
people/waldi/linux-2.6/debian/arch/alpha/config.alpha-smp
people/waldi/linux-2.6/debian/arch/amd64/config
people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic
people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8
people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4
people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
people/waldi/linux-2.6/debian/arch/arm/config
people/waldi/linux-2.6/debian/arch/arm/config.footbridge
people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
people/waldi/linux-2.6/debian/arch/arm/config.rpc
people/waldi/linux-2.6/debian/arch/arm/config.s3c2410
people/waldi/linux-2.6/debian/arch/config
people/waldi/linux-2.6/debian/arch/defines
people/waldi/linux-2.6/debian/arch/hppa/config
people/waldi/linux-2.6/debian/arch/i386/config
people/waldi/linux-2.6/debian/arch/i386/config.386
people/waldi/linux-2.6/debian/arch/i386/config.686
people/waldi/linux-2.6/debian/arch/i386/config.686-smp
people/waldi/linux-2.6/debian/arch/i386/config.k7
people/waldi/linux-2.6/debian/arch/i386/config.k7-smp
people/waldi/linux-2.6/debian/arch/i386/defines
people/waldi/linux-2.6/debian/arch/ia64/config
people/waldi/linux-2.6/debian/arch/m68k/config
people/waldi/linux-2.6/debian/arch/powerpc/config
people/waldi/linux-2.6/debian/arch/powerpc/config.apus
people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64
people/waldi/linux-2.6/debian/arch/powerpc/defines
people/waldi/linux-2.6/debian/arch/sparc/config
people/waldi/linux-2.6/debian/arch/sparc/config.sparc64
people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp
people/waldi/linux-2.6/debian/bin/gencontrol.py
people/waldi/linux-2.6/debian/changelog
people/waldi/linux-2.6/debian/patches-debian/modular-ide.patch
people/waldi/linux-2.6/debian/patches-debian/powerpc-apus.patch
people/waldi/linux-2.6/debian/rules
people/waldi/linux-2.6/debian/rules.real
Log:
Merge /dists/trunk/linux-2.6.
Modified: people/waldi/linux-2.6/debian/README.Debian
==============================================================================
--- people/waldi/linux-2.6/debian/README.Debian (original)
+++ people/waldi/linux-2.6/debian/README.Debian Sun Dec 4 11:44:32 2005
@@ -41,11 +41,6 @@
You must specify the exact memory map. For example, Compaq Proliant users
can specify mem=48M at 16M if they have 64M of memory.
-80386 compatibility
--------------------
-DRM modules will not work on true 80386 processors. These drivers all assume
-that cmpxchg is available.
-
IDE bswap option
----------------
The bswap option is obsolete and may disappear in future. For the moment
@@ -53,8 +48,6 @@
Additional Drivers
------------------
-* SCSI Media Changer
- http://bytesex.org/patches/
* Amiga Smart Filesystem driver
http://march.home.staszic.waw.pl/asfs/
@@ -75,5 +68,3 @@
. drivers/net/dgrs_firmware.c
* DAB firmware, driver disabled:
. drivers/usb/media/dabfirmware.h
-* QLA2XXX firmware, driver disabled:
- . drivers/scsi/qla2xxx/*_fw.c
Modified: people/waldi/linux-2.6/debian/arch/alpha/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/config (original)
+++ people/waldi/linux-2.6/debian/arch/alpha/config Sun Dec 4 11:44:32 2005
@@ -4,7 +4,7 @@
CONFIG_GENERIC_ISA_DMA=y
# CONFIG_GENERIC_IOMAP is not set
CONFIG_CLEAN_COMPILE=y
-# CONFIG_KOBJECT_UEVENT is not set
+CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
# CONFIG_KALLSYMS_ALL is not set
@@ -347,9 +347,6 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
@@ -454,8 +451,6 @@
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
CONFIG_ATM=y
CONFIG_ATM_CLIP=y
# CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1464,7 +1459,6 @@
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
Modified: people/waldi/linux-2.6/debian/arch/alpha/config.alpha-generic
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/config.alpha-generic (original)
+++ people/waldi/linux-2.6/debian/arch/alpha/config.alpha-generic Sun Dec 4 11:44:32 2005
@@ -4,7 +4,6 @@
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
-CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
CONFIG_DONGLE_OLD=y
Modified: people/waldi/linux-2.6/debian/arch/alpha/config.alpha-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/config.alpha-smp (original)
+++ people/waldi/linux-2.6/debian/arch/alpha/config.alpha-smp Sun Dec 4 11:44:32 2005
@@ -6,5 +6,4 @@
CONFIG_NR_CPUS=64
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_MATHEMU=y
-CONFIG_MKISS=m
# CONFIG_DIGIEPCA is not set
Modified: people/waldi/linux-2.6/debian/arch/amd64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config Sun Dec 4 11:44:32 2005
@@ -366,9 +366,6 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
@@ -476,8 +473,6 @@
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
CONFIG_ATM=y
CONFIG_ATM_CLIP=y
# CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1395,7 +1390,6 @@
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
@@ -1654,3 +1648,5 @@
CONFIG_W83977F_WDT=m
CONFIG_I6300ESB_WDT=m
CONFIG_USB_SUSPEND=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PM_LEGACY=y
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic Sun Dec 4 11:44:32 2005
@@ -8,7 +8,6 @@
# CONFIG_NUMA is not set
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
CONFIG_PCMCIA_XIRTULIP=m
@@ -48,3 +47,7 @@
CONFIG_FS_MBCACHE=y
# CONFIG_CHECKING is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_X86_MCE_AMD=y
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8 (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8 Sun Dec 4 11:44:32 2005
@@ -8,7 +8,6 @@
# CONFIG_NUMA is not set
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
CONFIG_PCMCIA_XIRTULIP=m
@@ -48,3 +47,7 @@
CONFIG_FS_MBCACHE=m
# CONFIG_CHECKING is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_X86_MCE_AMD=y
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp Sun Dec 4 11:44:32 2005
@@ -10,11 +10,9 @@
# CONFIG_SCHED_SMT is not set
CONFIG_K8_NUMA=y
# CONFIG_NUMA_EMU is not set
-CONFIG_DISCONTIGMEM=y
CONFIG_NUMA=y
CONFIG_HAVE_DEC_LOCK=y
CONFIG_NR_CPUS=32
-# CONFIG_ACPI_NUMA is not set
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_R8169_VLAN is not set
CONFIG_FB_MATROX_G=y
@@ -23,15 +21,16 @@
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
# CONFIG_HOTPLUG_CPU is not set
-CONFIG_SPARSEMEM=y
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_DIGIEPCA=m
-CONFIG_MKISS=m
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_DISCONTIGMEM=y
CONFIG_DISCONTIGMEM_MANUAL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_ACPI_NUMA=y
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4 (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4 Sun Dec 4 11:44:32 2005
@@ -8,7 +8,6 @@
# CONFIG_NUMA is not set
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
CONFIG_PCMCIA_XIRTULIP=m
@@ -48,3 +47,7 @@
CONFIG_FS_MBCACHE=m
# CONFIG_CHECKING is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_X86_MCE_AMD is not set
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4-smp (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4-smp Sun Dec 4 11:44:32 2005
@@ -23,4 +23,7 @@
CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_HOTPLUG_CPU is not set
CONFIG_DIGIEPCA=m
-CONFIG_MKISS=m
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_X86_MCE_AMD is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config Sun Dec 4 11:44:32 2005
@@ -1,5 +1,4 @@
CONFIG_ARM=y
-CONFIG_PACKET=y
# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_SLIP_SMART=y
CONFIG_SUNRPC_GSS=m
@@ -16,4 +15,3 @@
CONFIG_ECONET_NATIVE=y
CONFIG_EQUALIZER=m
CONFIG_NET_CLS_ROUTE=y
-CONFIG_PACKET_MMAP=y
Modified: people/waldi/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.footbridge Sun Dec 4 11:44:32 2005
@@ -180,8 +180,6 @@
#
# Networking options
#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
@@ -539,7 +537,6 @@
# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA2XXX is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
@@ -1136,7 +1133,6 @@
#
# USB Device Class drivers
#
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m
Modified: people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx Sun Dec 4 11:44:32 2005
@@ -189,8 +189,6 @@
#
# Networking options
#
-CONFIG_PACKET=m
-CONFIG_UNIX=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
@@ -1449,4 +1447,3 @@
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
-CONFIG_SCSI_QLA2XXX=m
Modified: people/waldi/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.rpc (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.rpc Sun Dec 4 11:44:32 2005
@@ -170,8 +170,6 @@
#
# Networking options
#
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
Modified: people/waldi/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.s3c2410 (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.s3c2410 Sun Dec 4 11:44:32 2005
@@ -200,7 +200,6 @@
#
# Networking options
#
-CONFIG_UNIX=y
CONFIG_XFRM=y
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config (original)
+++ people/waldi/linux-2.6/debian/arch/config Sun Dec 4 11:44:32 2005
@@ -164,7 +164,6 @@
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_DVB_USB=m
-CONFIG_ASK_IP_FIB_HASH=y
CONFIG_USB_LD=m
CONFIG_SERIAL_8250_FOURPORT=m
CONFIG_DVB_USB_VP7045=m
@@ -351,9 +350,6 @@
#
# Networking options
#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
CONFIG_XFRM=y
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
@@ -573,8 +569,6 @@
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
# CONFIG_BLK_DEV_IDESCSI is not set
CONFIG_W1_DS2433_CRC=y
@@ -614,14 +608,12 @@
# CONFIG_WANT_EARLY_SERIAL is not set
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_DAVICOM_PHY=m
-CONFIG_FLATMEM_MANUAL=y
CONFIG_IP_NF_CONNTRACK_EVENTS=y
CONFIG_IP_NF_NAT_PPTP=m
CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_NET_CDC_SUBSET=m
CONFIG_USB_NET_NET1080=m
CONFIG_9P_FS=m
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
CONFIG_FUSION_SAS=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_INET_DCCP_DIAG=m
@@ -630,7 +622,6 @@
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_USB_STORAGE_ONETOUCH=y
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_DRM_SAVAGE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_PHYLIB=m
@@ -646,7 +637,6 @@
CONFIG_INFINIBAND_USER_MAD=m
CONFIG_IP_NF_CONNTRACK_NETLINK=m
CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_DISCONTIGMEM_MANUAL is not set
CONFIG_HOSTAP_PLX=m
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_USB_NET_PLUSB=m
@@ -696,10 +686,56 @@
# CONFIG_NET_POCKET is not set
CONFIG_FW_LOADER=m
CONFIG_MII=m
-# CONFIG_SCSI_QLA2XXX is not set
CONFIG_BLK_DEV_IDEPNP=m
CONFIG_AIRO=m
CONFIG_SCSI_SATA_INTEL_COMBINED=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_SECURITY_NETWORK=y
CONFIG_XFS_QUOTA=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_SCSI_QLA6312=m
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_SCSI_QLA2322=m
+CONFIG_RTC_X1205_I2C=m
+CONFIG_SCSI_QLA21XX=m
+CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_USB_SERIAL_NOKIA_DKU2=m
+CONFIG_DEFAULT_AS=y
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_SCSI_SATA_SIL24=m
+CONFIG_SCSI_QLA2300=m
+CONFIG_MTD_ONENAND=m
+CONFIG_PPP_MPPE=m
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_SCSI_PDC_ADMA=m
+CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
+# CONFIG_OBSOLETE_OSS_DRIVER is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_VIDEO_EM28XX=m
+CONFIG_RFD_FTL=m
+# CONFIG_DEBUG_VM is not set
+CONFIG_SCSI_QLA22XX=m
+CONFIG_DVB_NXT200X=m
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_QLA24XX=m
+CONFIG_SCSI_QLA2XXX=m
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_TELCLOCK=m
+CONFIG_CARDMAN_4000=m
+CONFIG_USB_SERIAL_ANYDATA=m
+CONFIG_VIDEO_DECODER=m
+CONFIG_VIDEO_AUDIO_DECODER=m
+CONFIG_CARDMAN_4040=m
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_PACKET_MMAP=y
+CONFIG_MKISS=m
+CONFIG_VIDEO_BT848_DVB=y
+# CONFIG_USB_MIDI is not set
+CONFIG_OBSOLETE_OSS_USB_DRIVER=y
+CONFIG_ATM_DUMMY=m
Modified: people/waldi/linux-2.6/debian/arch/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/defines (original)
+++ people/waldi/linux-2.6/debian/arch/defines Sun Dec 4 11:44:32 2005
@@ -13,6 +13,7 @@
powerpc
s390
sparc
+image-ramdisk-generators: yaird initramfs-tools
[alpha]
#enabled: False
@@ -22,3 +23,8 @@
[mipsel]
available: False
+
+[image-ramdisk-generators]
+yaird: mkinitrd.yaird
+initramfs-tools: mkinitramfs
+
Modified: people/waldi/linux-2.6/debian/arch/hppa/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/config (original)
+++ people/waldi/linux-2.6/debian/arch/hppa/config Sun Dec 4 11:44:32 2005
@@ -233,9 +233,6 @@
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
CONFIG_NET_KEY=m
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
@@ -817,7 +814,6 @@
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set
CONFIG_USB_STORAGE=m
Modified: people/waldi/linux-2.6/debian/arch/i386/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config Sun Dec 4 11:44:32 2005
@@ -74,7 +74,7 @@
CONFIG_ACPI_ASUS=m
CONFIG_ACPI_IBM=m
CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_BLACKLIST_YEAR=2001
+CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_BUS=y
CONFIG_ACPI_EC=y
@@ -463,9 +463,6 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
@@ -573,8 +570,6 @@
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
CONFIG_ATM=y
CONFIG_ATM_CLIP=y
# CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1649,7 +1644,6 @@
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
@@ -1910,3 +1904,11 @@
CONFIG_SBC8360_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_I6300ESB_WDT=m
+CONFIG_X86_32=y
+CONFIG_BLK_DEV_CS5535=m
+CONFIG_PM_LEGACY=y
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
Modified: people/waldi/linux-2.6/debian/arch/i386/config.386
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.386 (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.386 Sun Dec 4 11:44:32 2005
@@ -43,7 +43,6 @@
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
-CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
Modified: people/waldi/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.686 (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.686 Sun Dec 4 11:44:32 2005
@@ -34,7 +34,6 @@
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
-CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
@@ -84,3 +83,4 @@
CONFIG_FS_MBCACHE=m
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_CMPXCHG64=y
Modified: people/waldi/linux-2.6/debian/arch/i386/config.686-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.686-smp (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.686-smp Sun Dec 4 11:44:32 2005
@@ -38,7 +38,6 @@
# CONFIG_SBPCD is not set
# CONFIG_CM206 is not set
# CONFIG_CDU31A is not set
-# CONFIG_MKISS is not set
# CONFIG_DMASCC is not set
# CONFIG_IRPORT_SIR is not set
# CONFIG_NI5010 is not set
@@ -70,3 +69,4 @@
CONFIG_X86_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y
Modified: people/waldi/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.k7 (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.k7 Sun Dec 4 11:44:32 2005
@@ -35,7 +35,6 @@
CONFIG_SBPCD=m
CONFIG_CM206=m
CONFIG_CDU31A=m
-CONFIG_MKISS=m
CONFIG_DMASCC=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
@@ -85,3 +84,4 @@
CONFIG_FS_MBCACHE=m
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_CMPXCHG64=y
Modified: people/waldi/linux-2.6/debian/arch/i386/config.k7-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config.k7-smp (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config.k7-smp Sun Dec 4 11:44:32 2005
@@ -39,7 +39,6 @@
# CONFIG_SBPCD is not set
# CONFIG_CM206 is not set
# CONFIG_CDU31A is not set
-# CONFIG_MKISS is not set
# CONFIG_DMASCC is not set
# CONFIG_IRPORT_SIR is not set
# CONFIG_NI5010 is not set
@@ -71,3 +70,4 @@
CONFIG_X86_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y
Modified: people/waldi/linux-2.6/debian/arch/i386/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/defines (original)
+++ people/waldi/linux-2.6/debian/arch/i386/defines Sun Dec 4 11:44:32 2005
@@ -12,16 +12,20 @@
[686]
class: PPro/Celeron/PII/PIII/P4
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+recommends: libc6-i686
[686-smp]
class: PPro/Celeron/PII/PIII/P4 SMP
longclass: multi-processor Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+recommends: libc6-i686
[k7]
class: AMD K7
longclass: 32bit AMD Duron/Athlon/AthlonXP
+recommends: libc6-i686
[k7-smp]
class: AMD K7 SMP
longclass: 32-bit multi-processor AMD Duron/Athlon/AthlonXP
+recommends: libc6-i686
Modified: people/waldi/linux-2.6/debian/arch/ia64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/config (original)
+++ people/waldi/linux-2.6/debian/arch/ia64/config Sun Dec 4 11:44:32 2005
@@ -313,9 +313,6 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
@@ -420,8 +417,6 @@
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
CONFIG_SCTP_HMAC_NONE=y
-# CONFIG_SCTP_HMAC_SHA1 is not set
-# CONFIG_SCTP_HMAC_MD5 is not set
# CONFIG_ATM is not set
CONFIG_BRIDGE=m
CONFIG_DECNET=m
@@ -1136,7 +1131,6 @@
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
@@ -1368,6 +1362,5 @@
# CONFIG_IA64_DEBUG_IRQ is not set
CONFIG_SYSVIPC_COMPAT=y
# CONFIG_PM_DEBUG is not set
-CONFIG_MKISS=m
CONFIG_DIGIEPCA=m
# CONFIG_CPU_FREQ is not set
Modified: people/waldi/linux-2.6/debian/arch/m68k/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/config (original)
+++ people/waldi/linux-2.6/debian/arch/m68k/config Sun Dec 4 11:44:32 2005
@@ -78,9 +78,6 @@
CONFIG_DM_MIRROR=m
CONFIG_DM_ZERO=m
CONFIG_NET=y
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
CONFIG_NET_KEY=y
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -190,8 +187,6 @@
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set
Modified: people/waldi/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config Sun Dec 4 11:44:32 2005
@@ -1022,7 +1022,6 @@
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
@@ -1238,7 +1237,6 @@
# CONFIG_DEBUG_HIGHMEM is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
-# CONFIG_XMON is not set
# CONFIG_BDI_SWITCH is not set
CONFIG_BOOTX_TEXT=y
CONFIG_KEXEC=y
@@ -1253,5 +1251,34 @@
CONFIG_PM_STD_PARTITION=""
CONFIG_HOTPLUG=y
# CONFIG_HOTPLUG_CPU is not set
-CONFIG_MKISS=m
CONFIG_I2C_PMAC_SMU=m
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PM_LEGACY=y
+CONFIG_PPC_I8259=y
+CONFIG_WINDFARM=m
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PPC_MPC106=y
+CONFIG_PPC_MERGE=y
+CONFIG_MPIC=y
+CONFIG_DEBUGGER=y
+CONFIG_PPC_RTAS=y
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_RTAS_ERROR_LOGGING is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+# CONFIG_XMON_DEFAULT is not set
+# CONFIG_GENERIC_TBSYNC is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_ISERIES is not set
+CONFIG_PPC_STD_MMU_32=y
+CONFIG_WATCHDOG_RTAS=m
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_RTAS_PROC=y
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC64 is not set
+CONFIG_XMON=y
Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.apus (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.apus Sun Dec 4 11:44:32 2005
@@ -320,11 +320,6 @@
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
@@ -386,9 +381,6 @@
#
# Networking options
#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -1057,7 +1049,6 @@
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_FS is not set
-# CONFIG_XMON is not set
# CONFIG_BDI_SWITCH is not set
#
Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc-miboot Sun Dec 4 11:44:32 2005
@@ -73,3 +73,5 @@
CONFIG_CRYPTO_MD5=y
# CONFIG_SOFTWARE_SUSPEND is not set
ONFIG_SOFTWARE_SUSPEND=m
+CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_IOSCHED="deadline"
Modified: people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64 (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config.powerpc64 Sun Dec 4 11:44:32 2005
@@ -68,9 +68,6 @@
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_DISCONTIGMEM=y
CONFIG_IRQ_ALL_CPUS=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
@@ -78,3 +75,28 @@
CONFIG_NEED_MULTIPLE_NODES=y
CONFIG_XICS=y
CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_MEMORY_HOTPLUG is not set
+# CONFIG_PPC_MPC106 is not set
+CONFIG_CPU_FREQ_PMAC64=y
+CONFIG_SPARSEMEM=y
+CONFIG_PPC_MERGE=y
+CONFIG_CELL_IIC=y
+CONFIG_MMIO_NVRAM=y
+CONFIG_PPC_CELL=y
+CONFIG_RTAS_ERROR_LOGGING=y
+CONFIG_GENERIC_TBSYNC=y
+# CONFIG_EMBEDDED6xx is not set
+CONFIG_WINDFARM_PM91=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_WINDFARM_PM81=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_I2C_PMAC_SMU=y
+# CONFIG_PPC_INDIRECT_PCI is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_52xx is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_POWER3=y
+CONFIG_POWER4=y
+# CONFIG_FLATMEM_MANUAL is not set
Modified: people/waldi/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/defines (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/defines Sun Dec 4 11:44:32 2005
@@ -4,19 +4,17 @@
powerpc-smp
powerpc-miboot
powerpc64
-kernel-arch: ppc
kernel-header-dirs: powerpc ppc ppc64 m68k
+kernel-arch: powerpc
kpkg-subarch: powerpc
[apus]
+kernel-arch: ppc
+kpkg-subarch: powerpc32
depends: mkvmlinuz (>= 15)
[powerpc]
-depends: mkvmlinuz (>= 13)
+depends: mkvmlinuz (>= 15)
[powerpc-smp]
-depends: mkvmlinuz (>= 13)
-
-[powerpc64]
-kernel-arch: ppc64
-kpkg-subarch: powerpc64
+depends: mkvmlinuz (>= 15)
Added: people/waldi/linux-2.6/debian/arch/powerpc/modules
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/powerpc/modules Sun Dec 4 11:44:32 2005
@@ -0,0 +1,213 @@
+kernel/fs/affs/affs.ko
+kernel/drivers/cdrom/cdrom.ko
+kernel/drivers/ide/ide-cd.ko
+kernel/drivers/scsi/sr_mod.ko
+kernel/fs/ext2/ext2.ko
+kernel/fs/ext3/ext3.ko
+kernel/fs/jbd/jbd.ko
+kernel/fs/fat/fat.ko
+kernel/fs/nls/nls_cp437.ko
+kernel/fs/nls/nls_iso8859-1.ko
+kernel/fs/vfat/vfat.ko
+kernel/drivers/ieee1394/ieee1394.ko
+kernel/drivers/ieee1394/ohci1394.ko
+kernel/drivers/ieee1394/sbp2.ko
+kernel/drivers/base/firmware_class.ko
+kernel/drivers/block/floppy.ko
+kernel/fs/mbcache.ko
+kernel/fs/nls/nls_utf8.ko
+kernel/fs/hfs/hfs.ko
+kernel/fs/hfsplus/hfsplus.ko
+kernel/drivers/ide/ide-disk.ko
+kernel/drivers/ide/ide-floppy.ko
+kernel/drivers/ide/ide-tape.ko
+kernel/drivers/ide/pci/aec62xx.ko
+kernel/drivers/ide/pci/cmd64x.ko
+kernel/drivers/ide/pci/generic.ko
+kernel/drivers/ide/pci/hpt34x.ko
+kernel/drivers/ide/pci/hpt366.ko
+kernel/drivers/ide/pci/ns87415.ko
+kernel/drivers/ide/pci/pdc202xx_new.ko
+kernel/drivers/ide/pci/pdc202xx_old.ko
+kernel/drivers/ide/pci/sc1200.ko
+kernel/drivers/ide/pci/siimage.ko
+kernel/drivers/ide/pci/sl82c105.ko
+kernel/drivers/ide/pci/trm290.ko
+kernel/drivers/ide/pci/via82cxxx.ko
+kernel/fs/isofs/isofs.ko
+kernel/drivers/input/keyboard/atkbd.ko
+kernel/drivers/input/serio/i8042.ko
+kernel/drivers/input/serio/libps2.ko
+kernel/drivers/input/serio/serio.ko
+kernel/drivers/usb/input/usbhid.ko
+kernel/net/ipv6/ipv6.ko
+kernel/drivers/net/irda/irtty-sir.ko
+kernel/drivers/net/irda/sir-dev.ko
+kernel/net/irda/ircomm/ircomm-tty.ko
+kernel/net/irda/ircomm/ircomm.ko
+kernel/net/irda/irda.ko
+kernel/net/irda/irlan/irlan.ko
+kernel/net/irda/irnet/irnet.ko
+kernel/fs/jfs/jfs.ko
+kernel/drivers/block/loop.ko
+kernel/drivers/md/dm-crypt.ko
+kernel/drivers/md/dm-mirror.ko
+kernel/drivers/md/dm-mod.ko
+kernel/drivers/md/dm-snapshot.ko
+kernel/drivers/md/linear.ko
+kernel/drivers/md/md-mod.ko
+kernel/drivers/md/multipath.ko
+kernel/drivers/md/raid0.ko
+kernel/drivers/md/raid1.ko
+kernel/drivers/md/raid5.ko
+kernel/drivers/md/xor.ko
+kernel/drivers/input/evdev.ko
+kernel/drivers/input/mouse/psmouse.ko
+kernel/drivers/net/dl2k.ko
+kernel/drivers/net/fealnx.ko
+kernel/drivers/net/hamachi.ko
+kernel/drivers/net/ixgb/ixgb.ko
+kernel/drivers/net/ns83820.ko
+kernel/drivers/net/r8169.ko
+kernel/drivers/net/s2io.ko
+kernel/drivers/net/sk98lin/sk98lin.ko
+kernel/drivers/net/starfire.ko
+kernel/drivers/net/tokenring/3c359.ko
+kernel/drivers/net/tokenring/abyss.ko
+kernel/drivers/net/tokenring/olympic.ko
+kernel/drivers/net/tokenring/tms380tr.ko
+kernel/drivers/net/tokenring/tmspci.ko
+kernel/drivers/net/tulip/de2104x.ko
+kernel/drivers/net/tulip/de4x5.ko
+kernel/drivers/net/tulip/dmfe.ko
+kernel/drivers/net/tulip/winbond-840.ko
+kernel/drivers/net/wireless/prism54/prism54.ko
+kernel/drivers/net/yellowfin.ko
+kernel/drivers/ieee1394/eth1394.ko
+kernel/drivers/net/3c59x.ko
+kernel/drivers/net/8139cp.ko
+kernel/drivers/net/8139too.ko
+kernel/drivers/net/appletalk/ipddp.ko
+kernel/drivers/net/b44.ko
+kernel/drivers/net/dummy.ko
+kernel/drivers/net/e100.ko
+kernel/drivers/net/e1000/e1000.ko
+kernel/drivers/net/eepro100.ko
+kernel/drivers/net/epic100.ko
+kernel/drivers/net/mv643xx_eth.ko
+kernel/drivers/net/natsemi.ko
+kernel/drivers/net/ne2k-pci.ko
+kernel/drivers/net/pcnet32.ko
+kernel/drivers/net/sis900.ko
+kernel/drivers/net/sundance.ko
+kernel/drivers/net/sungem.ko
+kernel/drivers/net/sungem_phy.ko
+kernel/drivers/net/sunhme.ko
+kernel/drivers/net/tulip/tulip.ko
+kernel/drivers/net/typhoon.ko
+kernel/drivers/net/via-rhine.ko
+kernel/drivers/net/wireless/airport.ko
+kernel/drivers/net/wireless/orinoco_pci.ko
+kernel/drivers/net/wireless/orinoco_plx.ko
+kernel/drivers/net/wireless/orinoco_tmd.ko
+kernel/net/appletalk/appletalk.ko
+kernel/drivers/net/arcnet/arcnet.ko
+kernel/drivers/net/arcnet/com20020.ko
+kernel/drivers/net/pcmcia/3c574_cs.ko
+kernel/drivers/net/pcmcia/3c589_cs.ko
+kernel/drivers/net/pcmcia/axnet_cs.ko
+kernel/drivers/net/pcmcia/com20020_cs.ko
+kernel/drivers/net/pcmcia/fmvj18x_cs.ko
+kernel/drivers/net/pcmcia/nmclan_cs.ko
+kernel/drivers/net/pcmcia/pcnet_cs.ko
+kernel/drivers/net/pcmcia/smc91c92_cs.ko
+kernel/drivers/net/pcmcia/xirc2ps_cs.ko
+kernel/drivers/net/tulip/xircom_cb.ko
+kernel/drivers/net/wireless/airo_cs.ko
+kernel/drivers/net/wireless/atmel.ko
+kernel/drivers/net/wireless/atmel_cs.ko
+kernel/drivers/net/wireless/netwave_cs.ko
+kernel/drivers/net/wireless/orinoco_cs.ko
+kernel/drivers/net/wireless/ray_cs.ko
+kernel/drivers/net/wireless/wavelan_cs.ko
+kernel/drivers/net/wireless/wl3501_cs.ko
+kernel/drivers/net/8390.ko
+kernel/drivers/net/mii.ko
+kernel/drivers/net/wireless/airo.ko
+kernel/drivers/net/wireless/hermes.ko
+kernel/drivers/net/wireless/orinoco.ko
+kernel/drivers/pcmcia/i82092.ko
+kernel/drivers/pcmcia/pcmcia.ko
+kernel/drivers/pcmcia/pcmcia_core.ko
+kernel/drivers/pcmcia/pd6729.ko
+kernel/drivers/pcmcia/rsrc_nonstatic.ko
+kernel/drivers/pcmcia/yenta_socket.ko
+kernel/drivers/ide/legacy/ide-cs.ko
+kernel/drivers/net/ppp_async.ko
+kernel/drivers/net/ppp_deflate.ko
+kernel/drivers/net/ppp_generic.ko
+kernel/drivers/net/ppp_synctty.ko
+kernel/drivers/net/pppoe.ko
+kernel/drivers/net/pppox.ko
+kernel/drivers/net/slhc.ko
+kernel/lib/crc-ccitt.ko
+kernel/lib/zlib_deflate/zlib_deflate.ko
+kernel/fs/reiserfs/reiserfs.ko
+kernel/drivers/block/sx8.ko
+kernel/drivers/scsi/ahci.ko
+kernel/drivers/scsi/libata.ko
+kernel/drivers/scsi/sata_mv.ko
+kernel/drivers/scsi/sata_nv.ko
+kernel/drivers/scsi/sata_promise.ko
+kernel/drivers/scsi/sata_qstor.ko
+kernel/drivers/scsi/sata_sil.ko
+kernel/drivers/scsi/sata_sis.ko
+kernel/drivers/scsi/sata_svw.ko
+kernel/drivers/scsi/sata_sx4.ko
+kernel/drivers/scsi/sata_uli.ko
+kernel/drivers/scsi/sata_via.ko
+kernel/drivers/scsi/sata_vsc.ko
+kernel/drivers/scsi/BusLogic.ko
+kernel/drivers/scsi/aic7xxx/aic79xx.ko
+kernel/drivers/scsi/aic7xxx/aic7xxx.ko
+kernel/drivers/scsi/scsi_transport_spi.ko
+kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko
+kernel/drivers/scsi/scsi_mod.ko
+kernel/drivers/scsi/sd_mod.ko
+kernel/drivers/block/DAC960.ko
+kernel/drivers/block/cciss.ko
+kernel/drivers/block/cpqarray.ko
+kernel/drivers/message/fusion/mptbase.ko
+kernel/drivers/message/fusion/mptscsih.ko
+kernel/drivers/scsi/3w-xxxx.ko
+kernel/drivers/scsi/aacraid/aacraid.ko
+kernel/drivers/scsi/aic7xxx_old.ko
+kernel/drivers/scsi/ch.ko
+kernel/drivers/scsi/dc395x.ko
+kernel/drivers/scsi/eata.ko
+kernel/drivers/scsi/ips.ko
+kernel/drivers/scsi/megaraid/megaraid_mbox.ko
+kernel/drivers/scsi/megaraid/megaraid_mm.ko
+kernel/drivers/scsi/osst.ko
+kernel/drivers/scsi/st.ko
+kernel/drivers/scsi/a100u2w.ko
+kernel/drivers/scsi/atp870u.ko
+kernel/drivers/scsi/dmx3191d.ko
+kernel/drivers/scsi/ipr.ko
+kernel/drivers/scsi/qlogicfas408.ko
+kernel/drivers/scsi/qlogicfc.ko
+kernel/drivers/scsi/sg.ko
+kernel/drivers/scsi/tmscsim.ko
+kernel/drivers/char/pcmcia/synclink_cs.ko
+kernel/drivers/net/wan/hdlc.ko
+kernel/drivers/net/wan/syncppp.ko
+kernel/drivers/usb/serial/usbserial.ko
+kernel/net/lapb/lapb.ko
+kernel/fs/ufs/ufs.ko
+kernel/drivers/usb/core/usbcore.ko
+kernel/drivers/usb/host/ehci-hcd.ko
+kernel/drivers/usb/host/ohci-hcd.ko
+kernel/drivers/usb/host/uhci-hcd.ko
+kernel/drivers/usb/storage/usb-storage.ko
+kernel/fs/exportfs/exportfs.ko
+kernel/fs/xfs/xfs.ko
Added: people/waldi/linux-2.6/debian/arch/powerpc/modules.README
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/powerpc/modules.README Sun Dec 4 11:44:32 2005
@@ -0,0 +1,58 @@
+Just for info, and to avoid bad blood or anything, this is for now just an
+experimentation to be able to test and experiment my ideas, before it is either
+abandoned, or declared good enough to be generalized. The main caveat joeyh had
+about this when we discussed it in the past, apart from it being just words and
+nobody doing the work behind it, was the effect the multiplication of .udeb
+packages had on the d-i Packages file parsing on low-memory systems. Especially
+as it seems d-i maintains three simultaneous in-memory copies of this Package
+file, not sure why exactly, but this could be obtimized maybe, but see 7) also.
+
+The plan goes as follows :
+
+ 1) We will provide one .udeb per module, this will bring it to 600 or so
+ .udebs for powerpc, for the three flavours (not counting apus or upcoming
+ nubus/legacy-iseries).
+
+ 2) Each udeb description will be taken from the appropriate Kconfig file in
+ the future, not sure how to best do that, though, we could match the modules
+ to Makefiles, and then to CONFIG_ entries, which we take the description
+ from the corresponding Kconfig. Maybe a better solution would be to list the
+ modules per CONFIG_ entry, and make one .udeb per main CONFIG_ option. This
+ would be easier to track in the long end also.
+
+ 3) Module/udeb dependency is taken from the depmod output or directly from
+ the modules.
+
+ 4) In the future, we should list only the main CONFIG_ options, and package
+ the modules in grouping, and list only the modules we actually need.
+ The modules only pulled in by dependency should be automatically split out
+ into packages that should never be used directly, and in a minimum way, using
+ a bit of graph analysis to determine the minimum set of such packages.
+ The problem with that is how to take the name and description of those
+ non-primary packages in an automated way.
+
+ 5) We really need a way to make the config option choice / module list more
+ robust, as the split-config thingy is not all that sane right now, and there
+ is no easy link from modules to config options. Needs more investigation.
+
+ 6) It may be possible that the packaging infrastructure still has some
+ trouble with this approach, even after those 2 years or so since the d-i team
+ chose to split its kernel-udeb packages. This needs solving before we go with
+ this for all arches, so let's experiment a bit with powerpc only.
+
+ 7) To ease the weight of this multiplication on .udeb packages on the d-i
+ Packages parsing, one could imagine to split off a separate Packages file for
+ each kernel flavour, residing in .../debian-installer/kernel/<version>-<abi>-<flavour>.
+ Not sure if all three d-i Packages parsing parts can handle multiple sources,
+ i think not, but this is something which it would be worth to fix independently
+ of this issue.
+
+
+Well, that is it, works needs done, but i sincerely think this is the right
+option for this, especially given the poor status of the inter-arch synchronization
+the d-i team has done with the kernel .udebs, and they rejecting all responsability
+to porters.
+
+Friendly,
+
+Sven Luther
Added: people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc Sun Dec 4 11:44:32 2005
@@ -0,0 +1,12 @@
+kernel/drivers/net/defxx.ko
+kernel/drivers/net/skfp/skfp.ko
+kernel/drivers/net/tlan.ko
+kernel/drivers/net/tokenring/lanstreamer.ko
+kernel/drivers/net/bmac.ko
+kernel/drivers/net/mace.ko
+kernel/drivers/net/pcmcia/ibmtr_cs.ko
+kernel/drivers/net/tulip/xircom_tulip_cb.ko
+kernel/drivers/scsi/3w-9xxx.ko
+kernel/drivers/scsi/dpt_i2o.ko
+kernel/drivers/scsi/mac53c94.ko
+kernel/drivers/scsi/mesh.ko
Added: people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc-miboot
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc-miboot Sun Dec 4 11:44:32 2005
@@ -0,0 +1,10 @@
+kernel/drivers/net/tlan.ko
+kernel/drivers/net/tokenring/lanstreamer.ko
+kernel/drivers/net/bmac.ko
+kernel/drivers/net/mace.ko
+kernel/drivers/net/pcmcia/ibmtr_cs.ko
+kernel/drivers/net/tulip/xircom_tulip_cb.ko
+kernel/drivers/scsi/3w-9xxx.ko
+kernel/drivers/scsi/dpt_i2o.ko
+kernel/drivers/scsi/mac53c94.ko
+kernel/drivers/scsi/mesh.ko
Added: people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc64
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/powerpc/modules.powerpc64 Sun Dec 4 11:44:32 2005
@@ -0,0 +1,6 @@
+kernel/arch/ppc64/kernel/hvcserver.ko
+kernel/drivers/char/hvcs.ko
+kernel/drivers/net/defxx.ko
+kernel/drivers/net/skfp/skfp.ko
+kernel/drivers/net/ibmveth.ko
+kernel/drivers/scsi/ibmvscsi/ibmvscsic.ko
Modified: people/waldi/linux-2.6/debian/arch/sparc/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config (original)
+++ people/waldi/linux-2.6/debian/arch/sparc/config Sun Dec 4 11:44:32 2005
@@ -92,9 +92,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_BOOTP is not set
@@ -468,3 +465,8 @@
CONFIG_DRM_MGA=m
CONFIG_SND_ALI5451=m
# CONFIG_PARPORT_PC_FIFO is not set
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_KPROBES is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
Modified: people/waldi/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config.sparc64 (original)
+++ people/waldi/linux-2.6/debian/arch/sparc/config.sparc64 Sun Dec 4 11:44:32 2005
@@ -330,7 +330,6 @@
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
Modified: people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp (original)
+++ people/waldi/linux-2.6/debian/arch/sparc/config.sparc64-smp Sun Dec 4 11:44:32 2005
@@ -334,7 +334,6 @@
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m
CONFIG_USB_STORAGE=m
Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py Sun Dec 4 11:44:32 2005
@@ -124,7 +124,7 @@
if vars.has_key('desc'):
in_entry['Description'] += "\n.\n" + vars['desc']
entry = self.process_package(in_entry, vars)
- for field in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
+ for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
value = entry.get(field, None)
t = vars.get(field.lower(), None)
if t is not None:
Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog (original)
+++ people/waldi/linux-2.6/debian/changelog Sun Dec 4 11:44:32 2005
@@ -1,8 +1,39 @@
-linux-2.6 (2.6.14-3) UNRELEASED; urgency=low
+linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) experimental; urgency=low
+
+ [ Frederik Schüler ]
+ * New upstream release candidate.
+ * Readdition of qla2xxx drivers, as firmware license has been fixed.
+ * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
+ statically linked has better performance then modules due to TLB issue.
+ * clean up debian-patches dir: remove all obsolete patches.
+
+ [ Simon Horman ]
+ * Enable MKISS globally (closes: #340215)
+ * Add recommends libc6-i686 to 686 and k7 image packages
+ (closes: #278729)
+ * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
+ as alsa snd-usb-audio still isn't quite there.
+ I expect this to be re-disabled at some stage,
+ possibly soon if it proves to be a source of bugs.
+ (closes: #340388)
+
+ [ Sven Luther ]
+ * [powerpc] Now use ARCH=powerpc for both 32bit and 64bit powerpc flavours.
+
+ [ Jurij Smakov ]
+ * Drop tty-locking-fixes9.patch, which was preventing the oops during
+ shutdown on some sparc machines with serial console. Proper fix has
+ been incorporated upstream.
+
+ -- Frederik Schüler <fs at debian.org> Thu, 1 Dec 2005 22:13:02 +0000
+
+linux-2.6 (2.6.14-3) unstable; urgency=low
[ Norbert Tretkowski ]
* [alpha] Switch to gcc 4.0.
* [alpha] Conflict with initramfs-tools, klibc is broken on alpha.
+ * [alpha] Enabled CONFIG_KOBJECT_UEVENT in arch/alphaconfig to fix trouble
+ with latest udev, thanks to Uwe Schindler for reporting. (closes: #338911)
* Bumped ABI revision:
+ ABI changes on sparc and alpha because of compiler switch.
+ 2.6.14.1 changes ABI of procfs.
@@ -31,6 +62,8 @@
- tcp: BIC max increment too large
* Remove alpha compile fix as contained in 2.6.14.2
* Readd CONFIG_XFS_QUOTA=y.
+ * Disable ACPI cutoff year on i386, was set to 2001.
+ No need for acpi=force on boot.
[ Jurij Smakov ]
* Fix the install-image script to correctly include all the necessary
@@ -68,10 +101,10 @@
* disable IEEE80211 drivers for all of m68k
[ Frederik Schüler ]
- * activate CONFIG_SECURITY_NETWORK to fix SElinux operation.
+ * activate CONFIG_SECURITY_NETWORK to fix SElinux operation.
(Closes: #338543)
- -- maximilian attems <maks at sternwelten.at> Fri, 11 Nov 2005 09:13:29 +0100
+ -- Norbert Tretkowski <nobse at debian.org> Mon, 14 Nov 2005 10:23:05 +0100
linux-2.6 (2.6.14-2) unstable; urgency=low
Modified: people/waldi/linux-2.6/debian/patches-debian/modular-ide.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches-debian/modular-ide.patch (original)
+++ people/waldi/linux-2.6/debian/patches-debian/modular-ide.patch Sun Dec 4 11:44:32 2005
@@ -3,9 +3,9 @@
## DP: Patch author: Herbert Xu
## DP: Upstream status: rejected
#
-diff -aurN a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
---- a/drivers/ide/ide-generic.c 2005-06-06 11:22:29.000000000 -0400
-+++ b/drivers/ide/ide-generic.c 2005-06-15 22:16:56.000000000 -0400
+diff -ruN source-old/drivers/ide/ide-generic.c source/drivers/ide/ide-generic.c
+--- source-old/drivers/ide/ide-generic.c 2005-10-28 02:02:08.000000000 +0200
++++ source/drivers/ide/ide-generic.c 2005-12-01 14:08:41.000000000 +0100
@@ -11,9 +11,14 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -21,9 +21,9 @@
if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
ide_get_lock(NULL, NULL); /* for atari only */
-diff -aurN a/drivers/ide/ide.c b/drivers/ide/ide.c
---- a/drivers/ide/ide.c 2005-06-06 11:22:29.000000000 -0400
-+++ b/drivers/ide/ide.c 2005-06-15 22:16:56.000000000 -0400
+diff -ruN source-old/drivers/ide/ide.c source/drivers/ide/ide.c
+--- source-old/drivers/ide/ide.c 2005-12-01 13:56:23.000000000 +0100
++++ source/drivers/ide/ide.c 2005-12-01 14:08:41.000000000 +0100
@@ -175,10 +175,11 @@
static int initializing; /* set while initializing built-in drivers */
@@ -37,7 +37,7 @@
#endif
#ifdef CONFIG_IDEDMA_AUTO
-@@ -1418,6 +1419,8 @@
+@@ -1417,6 +1418,8 @@
EXPORT_SYMBOL(generic_ide_ioctl);
@@ -46,7 +46,7 @@
/*
* stridx() returns the offset of c within s,
* or -1 if c is '\0' or not found within s.
-@@ -1797,9 +1800,9 @@
+@@ -1796,9 +1799,9 @@
*/
static void __init probe_for_hwifs (void)
{
@@ -59,10 +59,10 @@
#ifdef CONFIG_ETRAX_IDE
{
-diff -aurN a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
---- a/drivers/ide/setup-pci.c 2005-06-06 11:22:29.000000000 -0400
-+++ b/drivers/ide/setup-pci.c 2005-06-15 22:16:56.000000000 -0400
-@@ -837,7 +837,7 @@
+diff -ruN source-old/drivers/ide/setup-pci.c source/drivers/ide/setup-pci.c
+--- source-old/drivers/ide/setup-pci.c 2005-12-01 11:22:33.000000000 +0100
++++ source/drivers/ide/setup-pci.c 2005-12-01 14:08:41.000000000 +0100
+@@ -840,7 +840,7 @@
* boot up the pci layer takes over the job.
*/
@@ -71,7 +71,7 @@
{
struct list_head *l;
struct pci_driver *d;
-@@ -863,21 +863,23 @@
+@@ -866,21 +866,23 @@
/**
* ide_scan_pcibus - perform the initial IDE driver scan
@@ -98,16 +98,16 @@
while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
ide_scan_pcidev(dev);
}
-@@ -899,3 +901,5 @@
- pci_register_driver(d);
+@@ -902,3 +904,5 @@
+ __pci_register_driver(d, d->driver.owner);
}
}
+
+EXPORT_SYMBOL_GPL(ide_scan_pcibus);
-diff -aurN a/include/linux/ide.h b/include/linux/ide.h
---- a/include/linux/ide.h 2005-06-06 11:22:29.000000000 -0400
-+++ b/include/linux/ide.h 2005-06-15 22:16:56.000000000 -0400
-@@ -1115,6 +1115,7 @@
+diff -ruN source-old/include/linux/ide.h source/include/linux/ide.h
+--- source-old/include/linux/ide.h 2005-12-01 11:22:35.000000000 +0100
++++ source/include/linux/ide.h 2005-12-01 16:02:36.000000000 +0100
+@@ -1122,6 +1122,7 @@
extern ide_hwif_t ide_hwifs[]; /* master data repository */
#endif
extern int noautodma;
@@ -115,12 +115,12 @@
extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs);
-@@ -1323,7 +1324,7 @@
+@@ -1304,7 +1305,7 @@
extern int ideprobe_init(void);
-extern void ide_scan_pcibus(int scan_direction) __init;
+extern void ide_scan_pcibus(void);
- extern int ide_pci_register_driver(struct pci_driver *driver);
+ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
+ #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
extern void ide_pci_unregister_driver(struct pci_driver *driver);
- void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
Modified: people/waldi/linux-2.6/debian/patches-debian/powerpc-apus.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches-debian/powerpc-apus.patch (original)
+++ people/waldi/linux-2.6/debian/patches-debian/powerpc-apus.patch Sun Dec 4 11:44:32 2005
@@ -10,9 +10,61 @@
# i will not apply by default.
#
-diff -Nur -x CVS linux-2.6.13/arch/ppc/amiga/amiints.c linux-2.6.13-apus/arch/ppc/amiga/amiints.c
---- linux-2.6.13/arch/ppc/amiga/amiints.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/amiga/amiints.c 2004-02-04 22:21:34.000000000 +0100
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Kconfig linux-apus-2.6/arch/ppc/Kconfig
+--- linux-2.6.14/arch/ppc/Kconfig 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/Kconfig 2005-11-17 14:15:32.000000000 +0000
+@@ -537,7 +537,6 @@
+
+ config APUS
+ bool "Amiga-APUS"
+- depends on BROKEN
+ help
+ Select APUS if configuring for a PowerUP Amiga.
+ More information is available at:
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Makefile linux-apus-2.6/arch/ppc/Makefile
+--- linux-2.6.14/arch/ppc/Makefile 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/Makefile 2005-11-17 14:15:32.000000000 +0000
+@@ -55,9 +55,12 @@
+ head-$(CONFIG_44x) := arch/ppc/kernel/head_44x.o
+ head-$(CONFIG_FSL_BOOKE) := arch/ppc/kernel/head_fsl_booke.o
+
++head-y += arch/ppc/mm/hashtable.o
++head-y += arch/ppc/kernel/entry.o
+ head-$(CONFIG_6xx) += arch/ppc/kernel/idle_6xx.o
+ head-$(CONFIG_POWER4) += arch/ppc/kernel/idle_power4.o
+ head-$(CONFIG_PPC_FPU) += arch/ppc/kernel/fpu.o
++head-y += arch/ppc/kernel/head_end.o
+
+ core-y += arch/ppc/kernel/ arch/ppc/platforms/ \
+ arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/
+@@ -77,7 +80,9 @@
+
+ .PHONY: $(BOOT_TARGETS)
+
++ifndef CONFIG_APUS
+ all: uImage zImage
++endif
+
+ CPPFLAGS_vmlinux.lds := -Upowerpc
+
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/Makefile linux-apus-2.6/arch/ppc/amiga/Makefile
+--- linux-2.6.14/arch/ppc/amiga/Makefile 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/amiga/Makefile 2004-07-03 17:53:51.000000000 +0000
+@@ -1,8 +1,8 @@
+ #
+-# Makefile for Linux arch/m68k/amiga source directory
++# Makefile for Linux arch/ppc/amiga source directory
+ #
+
+-obj-y := config.o amiints.o cia.o time.o bootinfo.o amisound.o \
+- chipram.o amiga_ksyms.o
++obj-y := config.o amiints.o cia.o bootinfo.o \
++ amisound.o chipram.o amiga_ksyms.o
+
+ obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/amiints.c linux-apus-2.6/arch/ppc/amiga/amiints.c
+--- linux-2.6.14/arch/ppc/amiga/amiints.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/amiga/amiints.c 2004-02-04 21:21:34.000000000 +0000
@@ -67,9 +67,10 @@
static short ami_ablecount[AMI_IRQS];
@@ -86,9 +138,48 @@
}
#ifdef CONFIG_APUS
-diff -Nur -x CVS linux-2.6.13/arch/ppc/amiga/cia.c linux-2.6.13-apus/arch/ppc/amiga/cia.c
---- linux-2.6.13/arch/ppc/amiga/cia.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/amiga/cia.c 2004-02-04 22:21:34.000000000 +0100
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/bootinfo.c linux-apus-2.6/arch/ppc/amiga/bootinfo.c
+--- linux-2.6.14/arch/ppc/amiga/bootinfo.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/amiga/bootinfo.c 2005-11-17 14:15:32.000000000 +0000
+@@ -13,8 +13,9 @@
+
+ #include <asm/setup.h>
+ #include <asm/bootinfo.h>
++#include <asm/amigahw.h>
+
+-extern char cmd_line[CL_SIZE];
++extern char cmd_line[COMMAND_LINE_SIZE];
+
+ extern int num_memory;
+ extern int m68k_realnum_memory;
+@@ -23,8 +24,6 @@
+ extern struct mem_info ramdisk;
+
+ extern int amiga_parse_bootinfo(const struct bi_record *);
+-extern int atari_parse_bootinfo(const struct bi_record *);
+-extern int mac_parse_bootinfo(const struct bi_record *);
+
+ void __init parse_bootinfo(const struct bi_record *record)
+ {
+@@ -63,14 +62,7 @@
+ break;
+
+ default:
+- if (MACH_IS_AMIGA)
+- unknown = amiga_parse_bootinfo(record);
+- else if (MACH_IS_ATARI)
+- unknown = atari_parse_bootinfo(record);
+- else if (MACH_IS_MAC)
+- unknown = mac_parse_bootinfo(record);
+- else
+- unknown = 1;
++ unknown = amiga_parse_bootinfo(record);
+ }
+ if (unknown)
+ printk("parse_bootinfo: unknown tag 0x%04x ignored\n",
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/cia.c linux-apus-2.6/arch/ppc/amiga/cia.c
+--- linux-2.6.14/arch/ppc/amiga/cia.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/amiga/cia.c 2004-02-04 21:21:34.000000000 +0000
@@ -134,7 +134,7 @@
return cia_able_irq_private(base, mask);
}
@@ -106,9 +197,9 @@
}
void __init cia_init_IRQ(struct ciabase *base)
-diff -Nur -x CVS linux-2.6.13/arch/ppc/amiga/config.c linux-2.6.13-apus/arch/ppc/amiga/config.c
---- linux-2.6.13/arch/ppc/amiga/config.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/amiga/config.c 2005-07-30 20:52:47.000000000 +0200
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/config.c linux-apus-2.6/arch/ppc/amiga/config.c
+--- linux-2.6.14/arch/ppc/amiga/config.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/amiga/config.c 2005-07-30 18:52:47.000000000 +0000
@@ -20,11 +20,12 @@
#include <linux/mm.h>
#include <linux/kd.h>
@@ -596,24 +687,9 @@
return(len);
}
-diff -Nur -x CVS linux-2.6.13/arch/ppc/amiga/Makefile linux-2.6.13-apus/arch/ppc/amiga/Makefile
---- linux-2.6.13/arch/ppc/amiga/Makefile 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/amiga/Makefile 2004-07-03 19:53:51.000000000 +0200
-@@ -1,8 +1,8 @@
- #
--# Makefile for Linux arch/m68k/amiga source directory
-+# Makefile for Linux arch/ppc/amiga source directory
- #
-
--obj-y := config.o amiints.o cia.o time.o bootinfo.o amisound.o \
-- chipram.o amiga_ksyms.o
-+obj-y := config.o amiints.o cia.o bootinfo.o \
-+ amisound.o chipram.o amiga_ksyms.o
-
- obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o
-diff -Nur -x CVS linux-2.6.13/arch/ppc/amiga/time.c linux-2.6.13-apus/arch/ppc/amiga/time.c
---- linux-2.6.13/arch/ppc/amiga/time.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/amiga/time.c 1970-01-01 01:00:00.000000000 +0100
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/time.c linux-apus-2.6/arch/ppc/amiga/time.c
+--- linux-2.6.14/arch/ppc/amiga/time.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/amiga/time.c 1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-#include <linux/config.h> /* CONFIG_HEARTBEAT */
-#include <linux/errno.h>
@@ -673,24 +749,25 @@
- /* should be made smarter */
- ppc_md.heartbeat_count = 1;
-}
-diff -Nur -x CVS linux-2.6.13/arch/ppc/configs/apus_defconfig linux-2.6.13-apus/arch/ppc/configs/apus_defconfig
---- linux-2.6.13/arch/ppc/configs/apus_defconfig 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/configs/apus_defconfig 2005-08-04 20:04:09.000000000 +0200
-@@ -1,61 +1,99 @@
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/configs/apus_defconfig linux-apus-2.6/arch/ppc/configs/apus_defconfig
+--- linux-2.6.14/arch/ppc/configs/apus_defconfig 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/configs/apus_defconfig 2005-11-17 14:15:32.000000000 +0000
+@@ -1,103 +1,139 @@
#
# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.12
-+# Sun Jul 31 18:13:08 2005
++# Linux kernel version: 2.6.14
++# Sat Nov 12 20:49:48 2005
#
CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+-CONFIG_HAVE_DEC_LOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
- CONFIG_HAVE_DEC_LOCK=y
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
++CONFIG_ARCH_MAY_HAVE_PC_FDC=y
#
# Code maturity level options
@@ -704,6 +781,7 @@
# General setup
#
+CONFIG_LOCALVERSION=""
++# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-# CONFIG_BSD_PROCESS_ACCT is not set
@@ -716,6 +794,7 @@
+# CONFIG_HOTPLUG is not set
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
++CONFIG_INITRAMFS_SOURCE=""
# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
@@ -757,12 +836,14 @@
# CONFIG_POWER3 is not set
+# CONFIG_POWER4 is not set
# CONFIG_8xx is not set
++# CONFIG_E200 is not set
+# CONFIG_E500 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+# CONFIG_TAU is not set
++# CONFIG_KEXEC is not set
+# CONFIG_CPU_FREQ is not set
-+# CONFIG_PM is not set
++# CONFIG_WANT_EARLY_SERIAL is not set
+CONFIG_PPC_STD_MMU=y
#
@@ -776,10 +857,10 @@
# CONFIG_PPC_MULTIPLATFORM is not set
CONFIG_APUS=y
-# CONFIG_WILLOW_2 is not set
+-# CONFIG_PCORE is not set
+# CONFIG_KATANA is not set
+# CONFIG_WILLOW is not set
+# CONFIG_CPCI690 is not set
- # CONFIG_PCORE is not set
# CONFIG_POWERPMC250 is not set
-# CONFIG_EV64260 is not set
+# CONFIG_CHESTNUT is not set
@@ -787,15 +868,15 @@
+# CONFIG_HDPU is not set
+# CONFIG_EV64260 is not set
# CONFIG_LOPEC is not set
- # CONFIG_MCPN765 is not set
+-# CONFIG_MCPN765 is not set
# CONFIG_MVME5100 is not set
-@@ -63,41 +101,25 @@
+ # CONFIG_PPLUS is not set
# CONFIG_PRPMC750 is not set
# CONFIG_PRPMC800 is not set
# CONFIG_SANDPOINT is not set
+-# CONFIG_ADIR is not set
+-# CONFIG_K2 is not set
+# CONFIG_RADSTONE_PPC7D is not set
- # CONFIG_ADIR is not set
- # CONFIG_K2 is not set
# CONFIG_PAL4 is not set
# CONFIG_GEMINI is not set
+# CONFIG_EST8260 is not set
@@ -807,8 +888,9 @@
+# CONFIG_PQ2FADS is not set
+# CONFIG_LITE5200 is not set
+# CONFIG_MPC834x_SYS is not set
++# CONFIG_EV64360 is not set
# CONFIG_SMP is not set
- # CONFIG_PREEMPT is not set
+-# CONFIG_PREEMPT is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_TAU is not set
-# CONFIG_CPU_FREQ is not set
@@ -821,6 +903,20 @@
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_PERMEDIA=y
-CONFIG_KCORE_ELF=y
++# CONFIG_HZ_100 is not set
++CONFIG_HZ_250=y
++# CONFIG_HZ_1000 is not set
++CONFIG_HZ=250
++CONFIG_PREEMPT_NONE=y
++# CONFIG_PREEMPT_VOLUNTARY is not set
++# CONFIG_PREEMPT is not set
++CONFIG_SELECT_MEMORY_MODEL=y
++CONFIG_FLATMEM_MANUAL=y
++# CONFIG_DISCONTIGMEM_MANUAL is not set
++# CONFIG_SPARSEMEM_MANUAL is not set
++CONFIG_FLATMEM=y
++CONFIG_FLAT_NODE_MEM_MAP=y
++# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_BINFMT_ELF=y
-CONFIG_KERNEL_ELF=y
CONFIG_BINFMT_MISC=m
@@ -841,7 +937,7 @@
# CONFIG_CMDLINE_BOOL is not set
CONFIG_AMIGA=y
CONFIG_ZORRO=y
-@@ -105,16 +127,34 @@
+@@ -105,16 +141,36 @@
CONFIG_APUS_FAST_EXCEPT=y
CONFIG_AMIGA_PCMCIA=y
CONFIG_AMIGA_BUILTIN_SERIAL=y
@@ -860,6 +956,9 @@
CONFIG_HEARTBEAT=y
CONFIG_PROC_HARDWARE=y
CONFIG_ZORRO_NAMES=y
++# CONFIG_PM is not set
++# CONFIG_SOFTWARE_SUSPEND is not set
++# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
@@ -870,7 +969,6 @@
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_PERMEDIA=y
+CONFIG_PCI_LEGACY_PROC=y
-+CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
+
+#
@@ -880,10 +978,152 @@
#
# Advanced setup
-@@ -131,14 +171,36 @@
+@@ -131,14 +187,183 @@
CONFIG_BOOT_LOAD=0x00800000
#
++# Networking
++#
++CONFIG_NET=y
++
++#
++# Networking options
++#
++CONFIG_PACKET=y
++CONFIG_PACKET_MMAP=y
++CONFIG_UNIX=y
++# CONFIG_NET_KEY is not set
++CONFIG_INET=y
++# CONFIG_IP_MULTICAST is not set
++# CONFIG_IP_ADVANCED_ROUTER is not set
++CONFIG_IP_FIB_HASH=y
++# CONFIG_IP_PNP is not set
++# CONFIG_NET_IPIP is not set
++# CONFIG_NET_IPGRE is not set
++# CONFIG_ARPD is not set
++CONFIG_SYN_COOKIES=y
++# CONFIG_INET_AH is not set
++# CONFIG_INET_ESP is not set
++# CONFIG_INET_IPCOMP is not set
++# CONFIG_INET_TUNNEL is not set
++CONFIG_INET_DIAG=y
++CONFIG_INET_TCP_DIAG=y
++# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_TCP_CONG_BIC=y
++
++#
++# IP: Virtual Server Configuration
++#
++# CONFIG_IP_VS is not set
++# CONFIG_IPV6 is not set
++CONFIG_NETFILTER=y
++# CONFIG_NETFILTER_DEBUG is not set
++# CONFIG_NETFILTER_NETLINK is not set
++
++#
++# IP: Netfilter Configuration
++#
++CONFIG_IP_NF_CONNTRACK=m
++# CONFIG_IP_NF_CT_ACCT is not set
++# CONFIG_IP_NF_CONNTRACK_MARK is not set
++# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
++# CONFIG_IP_NF_CT_PROTO_SCTP is not set
++CONFIG_IP_NF_FTP=m
++CONFIG_IP_NF_IRC=m
++# CONFIG_IP_NF_NETBIOS_NS is not set
++CONFIG_IP_NF_TFTP=m
++CONFIG_IP_NF_AMANDA=m
++# CONFIG_IP_NF_PPTP is not set
++CONFIG_IP_NF_QUEUE=m
++CONFIG_IP_NF_IPTABLES=m
++CONFIG_IP_NF_MATCH_LIMIT=m
++# CONFIG_IP_NF_MATCH_IPRANGE is not set
++CONFIG_IP_NF_MATCH_MAC=m
++# CONFIG_IP_NF_MATCH_PKTTYPE is not set
++CONFIG_IP_NF_MATCH_MARK=m
++CONFIG_IP_NF_MATCH_MULTIPORT=m
++CONFIG_IP_NF_MATCH_TOS=m
++# CONFIG_IP_NF_MATCH_RECENT is not set
++# CONFIG_IP_NF_MATCH_ECN is not set
++# CONFIG_IP_NF_MATCH_DSCP is not set
++# CONFIG_IP_NF_MATCH_AH_ESP is not set
++CONFIG_IP_NF_MATCH_LENGTH=m
++CONFIG_IP_NF_MATCH_TTL=m
++CONFIG_IP_NF_MATCH_TCPMSS=m
++CONFIG_IP_NF_MATCH_HELPER=m
++CONFIG_IP_NF_MATCH_STATE=m
++CONFIG_IP_NF_MATCH_CONNTRACK=m
++CONFIG_IP_NF_MATCH_OWNER=m
++# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
++# CONFIG_IP_NF_MATCH_REALM is not set
++# CONFIG_IP_NF_MATCH_SCTP is not set
++# CONFIG_IP_NF_MATCH_DCCP is not set
++# CONFIG_IP_NF_MATCH_COMMENT is not set
++# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
++# CONFIG_IP_NF_MATCH_STRING is not set
++CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_TARGET_REJECT=m
++CONFIG_IP_NF_TARGET_LOG=m
++CONFIG_IP_NF_TARGET_ULOG=m
++CONFIG_IP_NF_TARGET_TCPMSS=m
++# CONFIG_IP_NF_TARGET_NFQUEUE is not set
++CONFIG_IP_NF_NAT=m
++CONFIG_IP_NF_NAT_NEEDED=y
++CONFIG_IP_NF_TARGET_MASQUERADE=m
++CONFIG_IP_NF_TARGET_REDIRECT=m
++# CONFIG_IP_NF_TARGET_NETMAP is not set
++# CONFIG_IP_NF_TARGET_SAME is not set
++CONFIG_IP_NF_NAT_SNMP_BASIC=m
++CONFIG_IP_NF_NAT_IRC=m
++CONFIG_IP_NF_NAT_FTP=m
++CONFIG_IP_NF_NAT_TFTP=m
++CONFIG_IP_NF_NAT_AMANDA=m
++CONFIG_IP_NF_MANGLE=m
++CONFIG_IP_NF_TARGET_TOS=m
++CONFIG_IP_NF_TARGET_ECN=m
++CONFIG_IP_NF_TARGET_DSCP=m
++CONFIG_IP_NF_TARGET_MARK=m
++# CONFIG_IP_NF_TARGET_CLASSIFY is not set
++# CONFIG_IP_NF_TARGET_TTL is not set
++# CONFIG_IP_NF_RAW is not set
++CONFIG_IP_NF_ARPTABLES=m
++CONFIG_IP_NF_ARPFILTER=m
++# CONFIG_IP_NF_ARP_MANGLE is not set
++
++#
++# DCCP Configuration (EXPERIMENTAL)
++#
++# CONFIG_IP_DCCP is not set
++
++#
++# SCTP Configuration (EXPERIMENTAL)
++#
++# CONFIG_IP_SCTP is not set
++# CONFIG_ATM is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_VLAN_8021Q is not set
++# CONFIG_DECNET is not set
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++# CONFIG_ATALK is not set
++# CONFIG_X25 is not set
++# CONFIG_LAPB is not set
++# CONFIG_NET_DIVERT is not set
++# CONFIG_ECONET is not set
++# CONFIG_WAN_ROUTER is not set
++# CONFIG_NET_SCHED is not set
++# CONFIG_NET_CLS_ROUTE is not set
++
++#
++# Network testing
++#
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_IRDA is not set
++# CONFIG_BT is not set
++# CONFIG_IEEE80211 is not set
++
++#
+# Device Drivers
+#
+
@@ -896,6 +1136,11 @@
+# CONFIG_DEBUG_DRIVER is not set
+
+#
++# Connector - unified userspace <-> kernelspace linker
++#
++# CONFIG_CONNECTOR is not set
++
++#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set
@@ -918,7 +1163,7 @@
#
# Block devices
-@@ -151,42 +213,41 @@
+@@ -151,42 +376,40 @@
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
@@ -932,7 +1177,6 @@
+CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_LBD is not set
+# CONFIG_CDROM_PKTCDVD is not set
@@ -978,7 +1222,7 @@
CONFIG_BLK_DEV_IDEFLOPPY=y
CONFIG_BLK_DEV_IDESCSI=m
# CONFIG_IDE_TASK_IOCTL is not set
-@@ -194,15 +255,21 @@
+@@ -194,15 +417,22 @@
#
# IDE chipset support/bugfixes
#
@@ -996,12 +1240,19 @@
-# SCSI support
+# SCSI device support
#
++# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
#
# SCSI support type (disk, tape, CD-ROM)
-@@ -218,53 +285,56 @@
+@@ -213,58 +443,65 @@
+ CONFIG_BLK_DEV_SR=y
+ CONFIG_BLK_DEV_SR_VENDOR=y
+ CONFIG_CHR_DEV_SG=m
++# CONFIG_CHR_DEV_SCH is not set
+
+ #
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
# CONFIG_SCSI_MULTI_LUN is not set
@@ -1015,6 +1266,7 @@
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
++# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
# SCSI low-level drivers
@@ -1033,6 +1285,7 @@
-# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
++# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
@@ -1064,6 +1317,7 @@
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
++# CONFIG_SCSI_QLA24XX is not set
+# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
@@ -1075,7 +1329,7 @@
CONFIG_A2091_SCSI=y
CONFIG_GVP11_SCSI=y
CONFIG_CYBERSTORM_SCSI=y
-@@ -272,18 +342,35 @@
+@@ -272,18 +509,38 @@
CONFIG_BLZ2060_SCSI=y
CONFIG_BLZ1230_SCSI=y
CONFIG_FASTLANE_SCSI=y
@@ -1108,6 +1362,9 @@
# Fusion MPT device support
#
# CONFIG_FUSION is not set
++# CONFIG_FUSION_SPI is not set
++# CONFIG_FUSION_FC is not set
++# CONFIG_FUSION_SAS is not set
#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
@@ -1115,154 +1372,119 @@
#
# CONFIG_IEEE1394 is not set
-@@ -293,6 +380,10 @@
+@@ -293,137 +550,40 @@
# CONFIG_I2O is not set
#
-+# Macintosh device drivers
-+#
-+
-+#
- # Networking support
- #
- CONFIG_NET=y
-@@ -300,11 +391,8 @@
- #
- # Networking options
- #
+-# Networking support
+-#
+-CONFIG_NET=y
+-
+-#
+-# Networking options
+-#
-CONFIG_PACKET=m
-+CONFIG_PACKET=y
- CONFIG_PACKET_MMAP=y
+-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
- CONFIG_UNIX=y
- # CONFIG_NET_KEY is not set
- CONFIG_INET=y
-@@ -314,16 +402,29 @@
- # CONFIG_NET_IPIP is not set
- # CONFIG_NET_IPGRE is not set
- # CONFIG_ARPD is not set
+-CONFIG_UNIX=y
+-# CONFIG_NET_KEY is not set
+-CONFIG_INET=y
+-# CONFIG_IP_MULTICAST is not set
+-# CONFIG_IP_ADVANCED_ROUTER is not set
+-# CONFIG_IP_PNP is not set
+-# CONFIG_NET_IPIP is not set
+-# CONFIG_NET_IPGRE is not set
+-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
- CONFIG_SYN_COOKIES=y
- # CONFIG_INET_AH is not set
- # CONFIG_INET_ESP is not set
- # CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_TUNNEL is not set
-+CONFIG_IP_TCPDIAG=y
-+# CONFIG_IP_TCPDIAG_IPV6 is not set
-+
-+#
-+# IP: Virtual Server Configuration
-+#
-+# CONFIG_IP_VS is not set
-+# CONFIG_IPV6 is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-
- #
- # IP: Netfilter Configuration
- #
- CONFIG_IP_NF_CONNTRACK=m
-+# CONFIG_IP_NF_CT_ACCT is not set
-+# CONFIG_IP_NF_CONNTRACK_MARK is not set
-+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
- CONFIG_IP_NF_FTP=m
- CONFIG_IP_NF_IRC=m
- CONFIG_IP_NF_TFTP=m
-@@ -331,11 +432,13 @@
- CONFIG_IP_NF_QUEUE=m
- CONFIG_IP_NF_IPTABLES=m
- CONFIG_IP_NF_MATCH_LIMIT=m
-+# CONFIG_IP_NF_MATCH_IPRANGE is not set
- CONFIG_IP_NF_MATCH_MAC=m
- # CONFIG_IP_NF_MATCH_PKTTYPE is not set
- CONFIG_IP_NF_MATCH_MARK=m
- CONFIG_IP_NF_MATCH_MULTIPORT=m
- CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
- # CONFIG_IP_NF_MATCH_ECN is not set
- # CONFIG_IP_NF_MATCH_DSCP is not set
- # CONFIG_IP_NF_MATCH_AH_ESP is not set
-@@ -345,15 +448,23 @@
- CONFIG_IP_NF_MATCH_HELPER=m
- CONFIG_IP_NF_MATCH_STATE=m
- CONFIG_IP_NF_MATCH_CONNTRACK=m
+-CONFIG_SYN_COOKIES=y
+-# CONFIG_INET_AH is not set
+-# CONFIG_INET_ESP is not set
+-# CONFIG_INET_IPCOMP is not set
+-
+-#
+-# IP: Netfilter Configuration
+-#
+-CONFIG_IP_NF_CONNTRACK=m
+-CONFIG_IP_NF_FTP=m
+-CONFIG_IP_NF_IRC=m
+-CONFIG_IP_NF_TFTP=m
+-CONFIG_IP_NF_AMANDA=m
+-CONFIG_IP_NF_QUEUE=m
+-CONFIG_IP_NF_IPTABLES=m
+-CONFIG_IP_NF_MATCH_LIMIT=m
+-CONFIG_IP_NF_MATCH_MAC=m
+-# CONFIG_IP_NF_MATCH_PKTTYPE is not set
+-CONFIG_IP_NF_MATCH_MARK=m
+-CONFIG_IP_NF_MATCH_MULTIPORT=m
+-CONFIG_IP_NF_MATCH_TOS=m
+-# CONFIG_IP_NF_MATCH_ECN is not set
+-# CONFIG_IP_NF_MATCH_DSCP is not set
+-# CONFIG_IP_NF_MATCH_AH_ESP is not set
+-CONFIG_IP_NF_MATCH_LENGTH=m
+-CONFIG_IP_NF_MATCH_TTL=m
+-CONFIG_IP_NF_MATCH_TCPMSS=m
+-CONFIG_IP_NF_MATCH_HELPER=m
+-CONFIG_IP_NF_MATCH_STATE=m
+-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_UNCLEAN=m
- CONFIG_IP_NF_MATCH_OWNER=m
-+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-+# CONFIG_IP_NF_MATCH_REALM is not set
-+# CONFIG_IP_NF_MATCH_SCTP is not set
-+# CONFIG_IP_NF_MATCH_COMMENT is not set
-+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
- CONFIG_IP_NF_FILTER=m
- CONFIG_IP_NF_TARGET_REJECT=m
+-CONFIG_IP_NF_MATCH_OWNER=m
+-CONFIG_IP_NF_FILTER=m
+-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_MIRROR=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_IP_NF_TARGET_TCPMSS=m
- CONFIG_IP_NF_NAT=m
- CONFIG_IP_NF_NAT_NEEDED=y
- CONFIG_IP_NF_TARGET_MASQUERADE=m
- CONFIG_IP_NF_TARGET_REDIRECT=m
-+# CONFIG_IP_NF_TARGET_NETMAP is not set
-+# CONFIG_IP_NF_TARGET_SAME is not set
- CONFIG_IP_NF_NAT_SNMP_BASIC=m
- CONFIG_IP_NF_NAT_IRC=m
- CONFIG_IP_NF_NAT_FTP=m
-@@ -364,64 +475,64 @@
- CONFIG_IP_NF_TARGET_ECN=m
- CONFIG_IP_NF_TARGET_DSCP=m
- CONFIG_IP_NF_TARGET_MARK=m
+-CONFIG_IP_NF_NAT=m
+-CONFIG_IP_NF_NAT_NEEDED=y
+-CONFIG_IP_NF_TARGET_MASQUERADE=m
+-CONFIG_IP_NF_TARGET_REDIRECT=m
+-CONFIG_IP_NF_NAT_SNMP_BASIC=m
+-CONFIG_IP_NF_NAT_IRC=m
+-CONFIG_IP_NF_NAT_FTP=m
+-CONFIG_IP_NF_NAT_TFTP=m
+-CONFIG_IP_NF_NAT_AMANDA=m
+-CONFIG_IP_NF_MANGLE=m
+-CONFIG_IP_NF_TARGET_TOS=m
+-CONFIG_IP_NF_TARGET_ECN=m
+-CONFIG_IP_NF_TARGET_DSCP=m
+-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-+# CONFIG_IP_NF_TARGET_CLASSIFY is not set
-+# CONFIG_IP_NF_RAW is not set
- CONFIG_IP_NF_ARPTABLES=m
- CONFIG_IP_NF_ARPFILTER=m
+-CONFIG_IP_NF_ARPTABLES=m
+-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_COMPAT_IPCHAINS=m
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IPV6 is not set
-# CONFIG_XFRM_USER is not set
-+# CONFIG_IP_NF_ARP_MANGLE is not set
-
- #
- # SCTP Configuration (EXPERIMENTAL)
- #
+-
+-#
+-# SCTP Configuration (EXPERIMENTAL)
+-#
-CONFIG_IPV6_SCTP__=y
- # CONFIG_IP_SCTP is not set
- # CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
- # CONFIG_VLAN_8021Q is not set
+-# CONFIG_IP_SCTP is not set
+-# CONFIG_ATM is not set
+-# CONFIG_VLAN_8021Q is not set
-# CONFIG_LLC is not set
- # CONFIG_DECNET is not set
+-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
- # CONFIG_X25 is not set
- # CONFIG_LAPB is not set
- # CONFIG_NET_DIVERT is not set
- # CONFIG_ECONET is not set
- # CONFIG_WAN_ROUTER is not set
+-# CONFIG_X25 is not set
+-# CONFIG_LAPB is not set
+-# CONFIG_NET_DIVERT is not set
+-# CONFIG_ECONET is not set
+-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
- #
- # QoS and/or fair queueing
+-
+-#
+-# QoS and/or fair queueing
++# Macintosh device drivers
#
- # CONFIG_NET_SCHED is not set
-+# CONFIG_NET_CLS_ROUTE is not set
+-# CONFIG_NET_SCHED is not set
#
- # Network testing
+-# Network testing
++# Network device support
#
- # CONFIG_NET_PKTGEN is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
+-# CONFIG_NET_PKTGEN is not set
CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
@@ -1278,6 +1500,11 @@
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-# CONFIG_ETHERTAP is not set
++
++#
++# PHY device support
++#
++# CONFIG_PHYLIB is not set
#
# Ethernet (10 or 100Mbit)
@@ -1292,9 +1519,24 @@
+CONFIG_ZORRO8390=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
++# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
-@@ -445,11 +556,28 @@
+
+ #
+@@ -432,6 +592,7 @@
+ # CONFIG_NET_TULIP is not set
+ # CONFIG_HP100 is not set
+ # CONFIG_NET_PCI is not set
++# CONFIG_NET_POCKET is not set
+
+ #
+ # Ethernet (1000 Mbit)
+@@ -443,118 +604,73 @@
+ # CONFIG_HAMACHI is not set
+ # CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
++# CONFIG_SIS190 is not set
++# CONFIG_SKGE is not set
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
@@ -1302,49 +1544,67 @@
#
# Ethernet (10000 Mbit)
#
++# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
+-# CONFIG_FDDI is not set
+-# CONFIG_HIPPI is not set
+-CONFIG_PLIP=m
+-CONFIG_PPP=y
+-CONFIG_PPP_MULTILINK=y
+-CONFIG_PPP_FILTER=y
+-CONFIG_PPP_ASYNC=y
+-CONFIG_PPP_SYNC_TTY=y
+-CONFIG_PPP_DEFLATE=y
+-CONFIG_PPP_BSDCOMP=y
+-CONFIG_PPPOE=y
+-CONFIG_SLIP=y
+-CONFIG_SLIP_COMPRESSED=y
+-CONFIG_SLIP_SMART=y
+-CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_S2IO is not set
-+
-+#
-+# Token Ring devices
-+#
-+# CONFIG_TR is not set
-+
-+#
-+# Wireless LAN (non-hamradio)
-+#
-+# CONFIG_NET_RADIO is not set
-+
-+#
-+# Wan interfaces
-+#
-+# CONFIG_WAN is not set
- # CONFIG_FDDI is not set
- # CONFIG_HIPPI is not set
- CONFIG_PLIP=m
-@@ -465,96 +593,29 @@
- CONFIG_SLIP_COMPRESSED=y
- CONFIG_SLIP_SMART=y
- CONFIG_SLIP_MODE_SLIP6=y
--
--#
+
+ #
-# Wireless LAN (non-hamradio)
--#
++# Token Ring devices
+ #
-# CONFIG_NET_RADIO is not set
--
--#
++# CONFIG_TR is not set
+
+ #
-# Token Ring devices (depends on LLC=y)
--#
- # CONFIG_NET_FC is not set
++# Wireless LAN (non-hamradio)
+ #
+-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
- # CONFIG_SHAPER is not set
--
--#
--# Wan interfaces
--#
--# CONFIG_WAN is not set
--
--#
+-# CONFIG_SHAPER is not set
++# CONFIG_NET_RADIO is not set
+
+ #
+ # Wan interfaces
+ #
+ # CONFIG_WAN is not set
++# CONFIG_FDDI is not set
++# CONFIG_HIPPI is not set
++CONFIG_PLIP=m
++CONFIG_PPP=y
++CONFIG_PPP_MULTILINK=y
++CONFIG_PPP_FILTER=y
++CONFIG_PPP_ASYNC=y
++CONFIG_PPP_SYNC_TTY=y
++CONFIG_PPP_DEFLATE=y
++CONFIG_PPP_BSDCOMP=y
++CONFIG_PPPOE=y
++CONFIG_SLIP=y
++CONFIG_SLIP_COMPRESSED=y
++CONFIG_SLIP_SMART=y
++CONFIG_SLIP_MODE_SLIP6=y
++# CONFIG_NET_FC is not set
++# CONFIG_SHAPER is not set
++# CONFIG_NETCONSOLE is not set
++# CONFIG_NETPOLL is not set
++# CONFIG_NET_POLL_CONTROLLER is not set
+
+ #
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
@@ -1353,18 +1613,15 @@
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-+# CONFIG_NETCONSOLE is not set
-
- #
- # ISDN subsystem
- #
+-
+-#
+-# ISDN subsystem
+-#
-# CONFIG_ISDN_BOOL is not set
-+# CONFIG_ISDN is not set
-
- #
+-
+-#
-# Graphics support
-+# Telephony Support
- #
+-#
-CONFIG_FB=y
-# CONFIG_FB_CIRRUS is not set
-CONFIG_FB_PM2=y
@@ -1399,15 +1656,18 @@
-
-#
-# Logo configuration
--#
++# ISDN subsystem
+ #
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
--
--#
--# Old CD-ROM drivers (not SCSI, not IDE)
--#
++# CONFIG_ISDN is not set
+
+ #
+-# Old CD-ROM drivers (not SCSI, not IDE)
++# Telephony Support
+ #
-# CONFIG_CD_NO_IDESCSI is not set
+# CONFIG_PHONE is not set
@@ -1425,7 +1685,7 @@
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-@@ -564,42 +625,37 @@
+@@ -564,42 +680,37 @@
CONFIG_INPUT_EVBUG=m
#
@@ -1480,7 +1740,7 @@
# CONFIG_SERIAL_NONSTANDARD is not set
#
-@@ -610,34 +666,16 @@
+@@ -610,34 +721,16 @@
#
# Non-8250 serial port support
#
@@ -1518,7 +1778,7 @@
# IPMI
#
# CONFIG_IPMI_HANDLER is not set
-@@ -656,11 +694,28 @@
+@@ -656,11 +749,38 @@
#
# Ftape, the floppy tape device driver
#
@@ -1544,12 +1804,22 @@
+# CONFIG_W1 is not set
+
+#
++# Hardware Monitoring support
++#
++# CONFIG_HWMON is not set
++# CONFIG_HWMON_VID is not set
++
++#
+# Misc devices
+#
++
++#
++# Multimedia Capabilities Port drivers
++#
#
# Multimedia devices
-@@ -673,6 +728,154 @@
+@@ -673,10 +793,164 @@
# CONFIG_DVB is not set
#
@@ -1588,6 +1858,7 @@
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
++# CONFIG_FB_CYBLA is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
@@ -1701,27 +1972,37 @@
+# CONFIG_INFINIBAND is not set
+
+#
++# SN Devices
++#
++
++#
# File systems
#
CONFIG_EXT2_FS=y
-@@ -686,10 +889,15 @@
+ # CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XIP is not set
+ CONFIG_EXT3_FS=y
+ CONFIG_EXT3_FS_XATTR=y
+ # CONFIG_EXT3_FS_POSIX_ACL is not set
+@@ -686,12 +960,16 @@
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-+
-+#
-+# XFS support
-+#
++# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
CONFIG_MINIX_FS=y
-CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_FS=m
++CONFIG_INOTIFY=y
# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
++# CONFIG_FUSE_FS is not set
-@@ -707,16 +915,21 @@
+ #
+ # CD-ROM/DVD Filesystems
+@@ -707,17 +985,20 @@
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
@@ -1733,18 +2014,19 @@
# Pseudo filesystems
#
CONFIG_PROC_FS=y
+-# CONFIG_DEVFS_FS is not set
+-CONFIG_DEVPTS_FS=y
+-# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
- # CONFIG_DEVFS_FS is not set
--CONFIG_DEVPTS_FS=y
- # CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y
-+# CONFIG_TMPFS_XATTR is not set
+# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
++# CONFIG_RELAYFS_FS is not set
#
-@@ -725,10 +938,11 @@
+ # Miscellaneous filesystems
+@@ -725,10 +1006,11 @@
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=y
CONFIG_HFS_FS=y
@@ -1757,17 +2039,22 @@
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
-@@ -741,6 +955,7 @@
+@@ -740,23 +1022,29 @@
+ #
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
++# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
++# CONFIG_NFSD_V3_ACL is not set
# CONFIG_NFSD_V4 is not set
-@@ -749,13 +964,14 @@
+ # CONFIG_NFSD_TCP is not set
+ CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
++CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_GSS is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
@@ -1780,9 +2067,11 @@
-# CONFIG_INTERMEZZO_FS is not set
+# CONFIG_CODA_FS_OLD_API is not set
# CONFIG_AFS_FS is not set
++# CONFIG_9P_FS is not set
#
-@@ -773,17 +989,15 @@
+ # Partition Types
+@@ -773,17 +1061,15 @@
CONFIG_SOLARIS_X86_PARTITION=y
CONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_LDM_PARTITION is not set
@@ -1801,7 +2090,7 @@
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
-@@ -806,8 +1020,9 @@
+@@ -806,8 +1092,9 @@
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_874=m
CONFIG_NLS_ISO8859_8=m
@@ -1812,7 +2101,7 @@
CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
-@@ -824,97 +1039,47 @@
+@@ -824,97 +1111,49 @@
CONFIG_NLS_UTF8=m
#
@@ -1893,6 +2182,7 @@
#
-# CONFIG_CRC32 is not set
+CONFIG_CRC_CCITT=y
++# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
@@ -1912,6 +2202,7 @@
+CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
@@ -1936,97 +2227,402 @@
+#
+# Hardware crypto devices
+#
-diff -Nur -x CVS linux-2.6.13/arch/ppc/platforms/apus_setup.c linux-2.6.13-apus/arch/ppc/platforms/apus_setup.c
---- linux-2.6.13/arch/ppc/platforms/apus_setup.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/platforms/apus_setup.c 2005-08-04 01:43:41.000000000 +0200
-@@ -17,11 +17,14 @@
- #include <linux/kernel.h>
- #include <linux/sched.h>
- #include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
- #include <linux/initrd.h>
-+#include <linux/module.h>
- #include <linux/seq_file.h>
-
- /* Needs INITSERIAL call in head.S! */
--#undef APUS_DEBUG
-+#define APUS_DEBUG
-
- #include <asm/bootinfo.h>
- #include <asm/setup.h>
-@@ -32,52 +35,26 @@
- #include <asm/dma.h>
- #include <asm/machdep.h>
- #include <asm/time.h>
-+#include <asm/tlbflush.h>
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/Makefile linux-apus-2.6/arch/ppc/kernel/Makefile
+--- linux-2.6.14/arch/ppc/kernel/Makefile 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/Makefile 2005-09-23 13:41:21.000000000 +0000
+@@ -9,10 +9,11 @@
+ extra-$(CONFIG_8xx) := head_8xx.o
+ extra-$(CONFIG_6xx) += idle_6xx.o
+ extra-$(CONFIG_POWER4) += idle_power4.o
++extra-y += entry.o head_end.o
+ extra-$(CONFIG_PPC_FPU) += fpu.o
+ extra-y += vmlinux.lds
- unsigned long m68k_machtype;
- char debug_device[6] = "";
+-obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
++obj-y := traps.o irq.o idle.o time.o misc.o \
+ process.o signal.o ptrace.o align.o \
+ semaphore.o syscalls.o setup.o \
+ cputable.o ppc_htab.o perfmon.o
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head.S linux-apus-2.6/arch/ppc/kernel/head.S
+--- linux-2.6.14/arch/ppc/kernel/head.S 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/head.S 2005-11-17 14:15:32.000000000 +0000
+@@ -353,6 +353,28 @@
+ #if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)
+ . = 0x100
+ b __secondary_start_gemini
++#elif defined(CONFIG_APUS)
++ . = 0x100
++ mfspr r4,SPRN_HID0
++ li r3,0
++ ori r3,r3,0xc000
++ andc r4,r4,r3
++ mtspr SPRN_HID0,r4
++ isync
++ sync
++ lis r8,0x6170
++ ori r8,r8,0x7573
++ lis r9,0xfff0
++ lwz r9,0x1f8(r9)
++ lis r1,init_thread_union at ha
++ addi r1,r1,init_thread_union at l
++ addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
++ subis r1,r1,KERNELBASE at h
++ add r1,r1,r9
++ mr r3,r8
++ mr r4,r9
++ mtlr r4
++ blrl
+ #else
+ EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD)
+ #endif
+@@ -408,7 +430,15 @@
+ bne 1f /* if not, try to put a PTE */
+ mfspr r4,SPRN_DAR /* into the hash table */
+ rlwinm r3,r10,32-15,21,21 /* DSISR_STORE -> _PAGE_RW */
++#ifndef CONFIG_APUS
+ bl hash_page
++#else
++ lis r5,hash_page at h
++ ori r5,r5,hash_page at l
++ tophys(r5,r5)
++ mtlr r5
++ blrl
++#endif
+ 1: stw r10,_DSISR(r11)
+ mr r5,r10
+ mfspr r4,SPRN_DAR
+@@ -433,7 +463,15 @@
+ beq 1f /* if so, try to put a PTE */
+ li r3,0 /* into the hash table */
+ mr r4,r12 /* SRR0 is fault address */
++#ifndef CONFIG_APUS
+ bl hash_page
++#else
++ lis r5,hash_page at h
++ ori r5,r5,hash_page at l
++ tophys(r5,r5)
++ mtlr r5
++ blrl
++#endif
+ 1: mr r4,r12
+ mr r5,r9
+ EXC_XFER_EE_LITE(0x400, handle_page_fault)
+@@ -1199,19 +1237,6 @@
+ bl machine_init
+ bl MMU_init
--extern void amiga_init_IRQ(void);
--
--extern void apus_setup_pci_ptrs(void);
--
--void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata = NULL;
--/* machine dependent irq functions */
--void (*mach_init_IRQ) (void) __initdata = NULL;
--void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
--void (*mach_get_model) (char *model) = NULL;
--int (*mach_get_hardware_list) (char *buffer) = NULL;
--int (*mach_get_irq_list) (struct seq_file *, void *) = NULL;
--void (*mach_process_int) (int, struct pt_regs *) = NULL;
--/* machine dependent timer functions */
--unsigned long (*mach_gettimeoffset) (void);
--void (*mach_gettod) (int*, int*, int*, int*, int*, int*);
--int (*mach_hwclk) (int, struct hwclk_time*) = NULL;
--int (*mach_set_clock_mmss) (unsigned long) = NULL;
--void (*mach_reset)( void );
--long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */
--#if defined(CONFIG_AMIGA_FLOPPY)
--void (*mach_floppy_setup) (char *, int *) __initdata = NULL;
--#endif
--#ifdef CONFIG_HEARTBEAT
--void (*mach_heartbeat) (int) = NULL;
--extern void apus_heartbeat (void);
+-#ifdef CONFIG_APUS
+- /* Copy exception code to exception vector base on APUS. */
+- lis r4,KERNELBASE at h
+-#ifdef CONFIG_APUS_FAST_EXCEPT
+- lis r3,0xfff0 /* Copy to 0xfff00000 */
+-#else
+- lis r3,0 /* Copy to 0x00000000 */
-#endif
+- li r5,0x4000 /* # bytes of memory to copy */
+- li r6,0
+- bl copy_and_flush /* copy the first 0x4000 bytes */
+-#endif /* CONFIG_APUS */
-
--extern unsigned long amiga_model;
--extern unsigned decrementer_count;/* count value for 1e6/HZ microseconds */
--extern unsigned count_period_num; /* 1 decrementer count equals */
--extern unsigned count_period_den; /* count_period_num / count_period_den us */
--
- int num_memory = 0;
- struct mem_info memory[NUM_MEMINFO];/* memory description */
- /* FIXME: Duplicate memory data to avoid conflicts with m68k shared code. */
- int m68k_realnum_memory = 0;
- struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
+ /*
+ * Go back to running unmapped so we can load up new values
+ * for SDR1 (hash table pointer) and the segment registers
+@@ -1229,6 +1254,22 @@
+ /* Load up the kernel context */
+ 2: bl load_up_mmu
-+unsigned long ppc_memstart;
-+unsigned long ppc_pgstart;
-+unsigned long ppc_memoffset;
-+
-+EXPORT_SYMBOL(ppc_memoffset);
-+EXPORT_SYMBOL(ppc_pgstart);
++#ifdef CONFIG_APUS
++ /* Copy exception code to exception vector base on APUS. */
++ lis r4,KERNELBASE at h
++ tophys(r4,r4)
++#ifdef CONFIG_APUS_FAST_EXCEPT
++ lis r3,0xfff0 /* Copy to 0xfff00000 */
++#else
++ lis r3,0 /* Copy to 0x00000000 */
++#endif
++ lis r5,__head_end at h /* # bytes of memory to copy */
++ ori r5,r5,__head_end at l
++ subis r5,r5,KERNELBASE at h
++ li r6,0
++ bl copy_and_flush /* copy the first 0x4000 bytes */
++#endif /* CONFIG_APUS */
+
- struct mem_info ramdisk;
+ #ifdef CONFIG_BDI_SWITCH
+ /* Add helper information for the Abatron bdiGDB debugger.
+ * We do this here because we know the mmu is disabled, and
+@@ -1409,6 +1450,17 @@
+ mtspr SPRN_DBAT0U,r11 /* bit in upper BAT register */
+ mtspr SPRN_IBAT0L,r8
+ mtspr SPRN_IBAT0U,r11
++#ifdef CONFIG_APUS
++ /* map ZII space for early debug prints */
++ lis r8,0x8000
++ ori r8,r8,0x01ff
++ mtspr SPRN_DBAT2U,r8
++ mtspr SPRN_IBAT2U,r8
++ lis r8,0x0000
++ ori r8,r8,0x002a
++ mtspr SPRN_DBAT2L,r8
++ mtspr SPRN_IBAT2L,r8
++#endif
+ isync
+ blr
--extern void amiga_floppy_setup(char *, int *);
--extern void config_amiga(void);
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head_end.S linux-apus-2.6/arch/ppc/kernel/head_end.S
+--- linux-2.6.14/arch/ppc/kernel/head_end.S 1970-01-01 00:00:00.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/head_end.S 2005-09-23 13:41:21.000000000 +0000
+@@ -0,0 +1,2 @@
++ .global __head_end
++__head_end:
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/misc.S linux-apus-2.6/arch/ppc/kernel/misc.S
+--- linux-2.6.14/arch/ppc/kernel/misc.S 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/misc.S 2005-11-17 14:15:32.000000000 +0000
+@@ -1377,7 +1377,11 @@
+ .long sys_fstat64
+ .long sys_pciconfig_read
+ .long sys_pciconfig_write
++#ifdef CONFIG_PCI
+ .long sys_pciconfig_iobase /* 200 */
++#else
++ .long sys_ni_syscall
++#endif
+ .long sys_ni_syscall /* 201 - reserved - MacOnLinux - new */
+ .long sys_getdents64
+ .long sys_pivot_root
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/ppc_ksyms.c linux-apus-2.6/arch/ppc/kernel/ppc_ksyms.c
+--- linux-2.6.14/arch/ppc/kernel/ppc_ksyms.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/ppc_ksyms.c 2005-11-17 14:15:32.000000000 +0000
+@@ -65,8 +65,6 @@
+ long long __ashldi3(long long, int);
+ long long __lshrdi3(long long, int);
- static int __60nsram = 0;
+-extern unsigned long mm_ptov (unsigned long paddr);
+-
+ EXPORT_SYMBOL(clear_pages);
+ EXPORT_SYMBOL(clear_user_page);
+ EXPORT_SYMBOL(do_signal);
+@@ -142,7 +140,6 @@
+ EXPORT_SYMBOL(_insl_ns);
+ EXPORT_SYMBOL(_outsl_ns);
+ EXPORT_SYMBOL(iopa);
+-EXPORT_SYMBOL(mm_ptov);
+ EXPORT_SYMBOL(ioremap);
+ #ifdef CONFIG_44x
+ EXPORT_SYMBOL(ioremap64);
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/setup.c linux-apus-2.6/arch/ppc/kernel/setup.c
+--- linux-2.6.14/arch/ppc/kernel/setup.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/setup.c 2005-11-17 14:15:32.000000000 +0000
+@@ -546,6 +546,7 @@
+ #endif /* CONFIG_SERIAL_CORE_CONSOLE */
+ #endif /* CONFIG_PPC_MULTIPLATFORM */
-@@ -92,25 +69,43 @@
- */
- unsigned long apus_get_rtc_time(void)
++#ifndef CONFIG_APUS
+ struct bi_record *find_bootinfo(void)
{
--#ifdef CONFIG_APUS
-- extern unsigned long m68k_get_rtc_time(void);
-+ struct rtc_time t;
+ struct bi_record *rec;
+@@ -592,6 +593,7 @@
+ rec = (struct bi_record *)((ulong)rec + rec->size);
+ }
+ }
++#endif
-- return m68k_get_rtc_time ();
--#else
-- return 0;
+ /*
+ * Find out what kind of machine we're on and save any data we need
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/time.c linux-apus-2.6/arch/ppc/kernel/time.c
+--- linux-2.6.14/arch/ppc/kernel/time.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/kernel/time.c 2005-11-17 14:15:32.000000000 +0000
+@@ -152,6 +152,7 @@
+ tb_last_stamp = jiffy_stamp;
+ do_timer(regs);
+
++#ifndef CONFIG_APUS
+ /*
+ * update the rtc when needed, this should be performed on the
+ * right fraction of a second. Half or full second ?
+@@ -178,6 +179,7 @@
+ /* Try again one minute later */
+ last_rtc_update += 60;
+ }
++#endif
+ write_sequnlock(&xtime_lock);
+ }
+ if ( !disarm_decr[smp_processor_id()] )
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/Makefile linux-apus-2.6/arch/ppc/mm/Makefile
+--- linux-2.6.14/arch/ppc/mm/Makefile 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/mm/Makefile 2004-09-25 21:09:43.000000000 +0000
+@@ -5,7 +5,8 @@
+ obj-y := fault.o init.o mem_pieces.o \
+ mmu_context.o pgtable.o
+
+-obj-$(CONFIG_PPC_STD_MMU) += hashtable.o ppc_mmu.o tlb.o
++extra-$(CONFIG_PPC_STD_MMU) := hashtable.o
++obj-$(CONFIG_PPC_STD_MMU) += ppc_mmu.o tlb.o
+ obj-$(CONFIG_40x) += 4xx_mmu.o
+ obj-$(CONFIG_44x) += 44x_mmu.o
+ obj-$(CONFIG_FSL_BOOKE) += fsl_booke_mmu.o
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/init.c linux-apus-2.6/arch/ppc/mm/init.c
+--- linux-2.6.14/arch/ppc/mm/init.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/mm/init.c 2005-11-17 14:15:32.000000000 +0000
+@@ -61,9 +61,6 @@
+ unsigned long total_memory;
+ unsigned long total_lowmem;
+
+-unsigned long ppc_memstart;
+-unsigned long ppc_memoffset = PAGE_OFFSET;
+-
+ int mem_init_done;
+ int init_bootmem_done;
+ int boot_mapsize;
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/pgtable.c linux-apus-2.6/arch/ppc/mm/pgtable.c
+--- linux-2.6.14/arch/ppc/mm/pgtable.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/mm/pgtable.c 2005-09-18 13:03:35.000000000 +0000
+@@ -190,8 +190,8 @@
+ * Don't allow anybody to remap normal RAM that we're using.
+ * mem_init() sets high_memory so only do the check after that.
+ */
+- if ( mem_init_done && (p < virt_to_phys(high_memory)) )
+- {
++ if (mem_init_done && (p + size >= virt_to_phys(KERNELBASE)) &&
++ (p < virt_to_phys(high_memory))) {
+ printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
+ __builtin_return_address(0));
+ return NULL;
+@@ -429,42 +429,3 @@
+
+ return(pa);
+ }
+-
+-/* This is will find the virtual address for a physical one....
+- * Swiped from APUS, could be dangerous :-).
+- * This is only a placeholder until I really find a way to make this
+- * work. -- Dan
+- */
+-unsigned long
+-mm_ptov (unsigned long paddr)
+-{
+- unsigned long ret;
+-#if 0
+- if (paddr < 16*1024*1024)
+- ret = ZTWO_VADDR(paddr);
+- else {
+- int i;
+-
+- for (i = 0; i < kmap_chunk_count;){
+- unsigned long phys = kmap_chunks[i++];
+- unsigned long size = kmap_chunks[i++];
+- unsigned long virt = kmap_chunks[i++];
+- if (paddr >= phys
+- && paddr < (phys + size)){
+- ret = virt + paddr - phys;
+- goto exit;
+- }
+- }
+-
+- ret = (unsigned long) __va(paddr);
+- }
+-exit:
+-#ifdef DEBUGPV
+- printk ("PTOV(%lx)=%lx\n", paddr, ret);
+-#endif
+-#else
+- ret = (unsigned long)paddr + KERNELBASE;
+-#endif
+- return ret;
+-}
+-
+diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/platforms/apus_setup.c linux-apus-2.6/arch/ppc/platforms/apus_setup.c
+--- linux-2.6.14/arch/ppc/platforms/apus_setup.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/arch/ppc/platforms/apus_setup.c 2005-11-17 14:15:32.000000000 +0000
+@@ -17,11 +17,14 @@
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+ #include <linux/init.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
+ #include <linux/initrd.h>
++#include <linux/module.h>
+ #include <linux/seq_file.h>
+
+ /* Needs INITSERIAL call in head.S! */
+-#undef APUS_DEBUG
++#define APUS_DEBUG
+
+ #include <asm/bootinfo.h>
+ #include <asm/setup.h>
+@@ -32,52 +35,27 @@
+ #include <asm/dma.h>
+ #include <asm/machdep.h>
+ #include <asm/time.h>
++#include <asm/tlbflush.h>
+
+ unsigned long m68k_machtype;
+ char debug_device[6] = "";
+
+-extern void amiga_init_IRQ(void);
+-
+-extern void apus_setup_pci_ptrs(void);
+-
+-void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata = NULL;
+-/* machine dependent irq functions */
+-void (*mach_init_IRQ) (void) __initdata = NULL;
+-void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
+-void (*mach_get_model) (char *model) = NULL;
+-int (*mach_get_hardware_list) (char *buffer) = NULL;
+-int (*mach_get_irq_list) (struct seq_file *, void *) = NULL;
+-void (*mach_process_int) (int, struct pt_regs *) = NULL;
+-/* machine dependent timer functions */
+-unsigned long (*mach_gettimeoffset) (void);
+-void (*mach_gettod) (int*, int*, int*, int*, int*, int*);
+-int (*mach_hwclk) (int, struct hwclk_time*) = NULL;
+-int (*mach_set_clock_mmss) (unsigned long) = NULL;
+-void (*mach_reset)( void );
+-long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */
+-#if defined(CONFIG_AMIGA_FLOPPY)
+-void (*mach_floppy_setup) (char *, int *) __initdata = NULL;
+-#endif
+-#ifdef CONFIG_HEARTBEAT
+-void (*mach_heartbeat) (int) = NULL;
+-extern void apus_heartbeat (void);
+-#endif
+-
+-extern unsigned long amiga_model;
+-extern unsigned decrementer_count;/* count value for 1e6/HZ microseconds */
+-extern unsigned count_period_num; /* 1 decrementer count equals */
+-extern unsigned count_period_den; /* count_period_num / count_period_den us */
+-
+ int num_memory = 0;
+ struct mem_info memory[NUM_MEMINFO];/* memory description */
+ /* FIXME: Duplicate memory data to avoid conflicts with m68k shared code. */
+ int m68k_realnum_memory = 0;
+-struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
++EXPORT_SYMBOL(memory);
++EXPORT_SYMBOL(m68k_realnum_memory);
++
++unsigned long ppc_memstart;
++unsigned long ppc_pgstart;
++unsigned long ppc_memoffset;
++
++EXPORT_SYMBOL(ppc_memoffset);
++EXPORT_SYMBOL(ppc_pgstart);
+
+ struct mem_info ramdisk;
+
+-extern void amiga_floppy_setup(char *, int *);
+-extern void config_amiga(void);
+
+ static int __60nsram = 0;
+
+@@ -92,25 +70,43 @@
+ */
+ unsigned long apus_get_rtc_time(void)
+ {
+-#ifdef CONFIG_APUS
+- extern unsigned long m68k_get_rtc_time(void);
++ struct rtc_time t;
+
+- return m68k_get_rtc_time ();
+-#else
+- return 0;
-#endif
+ amiga_hwclk(0, &t);
+ t.tm_year += 1900;
@@ -2072,7 +2668,7 @@
/*********************************************************** SETUP */
/* From arch/m68k/kernel/setup.c. */
-@@ -206,8 +201,8 @@
+@@ -206,8 +202,8 @@
void apus_calibrate_decr(void)
{
@@ -2082,7 +2678,7 @@
/* This algorithm for determining the bus speed was
contributed by Ralph Schmidt. */
-@@ -239,15 +234,34 @@
+@@ -239,15 +235,34 @@
freq = 15000000;
} else if ((bus_speed >= 63) && (bus_speed < 69)) {
bus_speed = 67;
@@ -2119,7 +2715,7 @@
/* Ease diagnostics... */
{
extern int __map_without_bats;
-@@ -285,36 +299,8 @@
+@@ -285,36 +300,8 @@
__bus_speed = bus_speed;
__speed_test_failed = speed_test_failed;
@@ -2156,7 +2752,7 @@
/*********************************************************** MEMORY */
#define KMAP_MAX 32
unsigned long kmap_chunks[KMAP_MAX*3];
-@@ -330,26 +316,22 @@
+@@ -330,26 +317,22 @@
va &= PAGE_MASK;
dir = pgd_offset( mm, va );
@@ -2189,7 +2785,7 @@
case IOMAP_FULL_CACHING:
mask = ~(_PAGE_NO_CACHE | _PAGE_GUARDED);
flags = 0;
-@@ -359,60 +341,29 @@
+@@ -359,60 +342,29 @@
flags = (_PAGE_NO_CACHE | _PAGE_GUARDED);
break;
default:
@@ -2256,7 +2852,7 @@
int mm_end_of_chunk (unsigned long addr, int len)
{
if (memory[0].addr + memory[0].size == addr + len)
-@@ -422,11 +373,10 @@
+@@ -422,11 +374,10 @@
/*********************************************************** CACHE */
@@ -2270,7 +2866,7 @@
if (MAX_CACHE_SIZE < length)
length = MAX_CACHE_SIZE;
-@@ -443,12 +393,14 @@
+@@ -443,12 +394,14 @@
: : "r" (addr));
}
@@ -2287,7 +2883,7 @@
__asm ("dcbf 0,%0\n\t"
"sync \n\t"
-@@ -518,6 +470,8 @@
+@@ -518,6 +471,8 @@
level = (ipl_emu >> 3) & IPLEMU_IPLMASK;
mask = IPLEMU_SETRESET|IPLEMU_DISABLEINT|level;
level ^= 7;
@@ -2296,7 +2892,7 @@
/* Save previous IPL value */
if (last_ipl[level])
-@@ -535,6 +489,15 @@
+@@ -535,6 +490,15 @@
return level + IRQ_AMIGA_AUTO;
}
@@ -2312,7 +2908,7 @@
void apus_end_irq(unsigned int irq)
{
unsigned char ipl_emu;
-@@ -646,10 +609,12 @@
+@@ -646,10 +610,12 @@
__debug_ser_out('\r');
}
@@ -2325,7 +2921,7 @@
/****************************************************** init */
-@@ -664,6 +629,8 @@
+@@ -664,6 +630,8 @@
struct hw_interrupt_type amiga_sys_irqctrl = {
.typename = "Amiga IPL",
@@ -2334,7 +2930,7 @@
.end = apus_end_irq,
};
-@@ -677,33 +644,32 @@
+@@ -677,33 +645,32 @@
unsigned long __init apus_find_end_of_memory(void)
{
int shadow = 0;
@@ -2387,303 +2983,74 @@
ppc_memoffset = PAGE_OFFSET - PPC_MEMSTART;
total = memory[0].size;
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/zorro.h linux-2.6.13-apus/include/asm-ppc/zorro.h
---- linux-2.6.13/include/asm-ppc/zorro.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/zorro.h 2005-08-04 01:48:26.000000000 +0200
-@@ -3,13 +3,50 @@
+diff -Nur -x.gitignore -xCVS linux-2.6.14/drivers/block/amiflop.c linux-apus-2.6/drivers/block/amiflop.c
+--- linux-2.6.14/drivers/block/amiflop.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/drivers/block/amiflop.c 2005-07-30 23:06:43.000000000 +0000
+@@ -59,6 +59,7 @@
+ #include <linux/hdreg.h>
+ #include <linux/delay.h>
+ #include <linux/init.h>
++#include <linux/interrupt.h>
+ #include <linux/amifdreg.h>
+ #include <linux/amifd.h>
+ #include <linux/buffer_head.h>
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-m68k/bootinfo.h linux-apus-2.6/include/asm-m68k/bootinfo.h
+--- linux-2.6.14/include/asm-m68k/bootinfo.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-m68k/bootinfo.h 2005-07-30 20:49:24.000000000 +0000
+@@ -81,6 +81,8 @@
+ #define BI_AMIGA_ECLOCK 0x8005 /* EClock frequency (u_long) */
+ #define BI_AMIGA_CHIPSET 0x8006 /* native chipset present (u_long) */
+ #define BI_AMIGA_SERPER 0x8007 /* serial port period (u_short) */
++#define BI_AMIGA_PUP_BRIDGE 0x8008 /* powerup bridge (u_short) */
++#define BI_AMIGA_BPPC_SCSI 0x8009 /* blizzard ppc scsi*/
- #include <asm/io.h>
+ /*
+ * Atari-specific tags
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/amigahw.h linux-apus-2.6/include/asm-ppc/amigahw.h
+--- linux-2.6.14/include/asm-ppc/amigahw.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/amigahw.h 2005-11-17 14:17:12.000000000 +0000
+@@ -1,6 +1,6 @@
+-#ifdef __KERNEL__
+ #ifndef __ASMPPC_AMIGAHW_H
+ #define __ASMPPC_AMIGAHW_H
++#ifdef __KERNEL__
--#define z_readb in_8
--#define z_readw in_be16
--#define z_readl in_be32
--
--#define z_writeb(val, port) out_8((port), (val))
--#define z_writew(val, port) out_be16((port), (val))
--#define z_writel(val, port) out_be32((port), (val))
-+static inline unsigned int z_readb(unsigned long addr)
-+{
-+ unsigned int ret;
-+
-+ ret = *(volatile u8 *)addr;
-+ eieio();
-+ return ret;
-+}
-+
-+static inline unsigned int z_readw(unsigned long addr)
-+{
-+ unsigned int ret;
-+
-+ ret = *(volatile u16 *)addr;
-+ eieio();
-+ return ret;
-+}
-+
-+static inline unsigned int z_readl(unsigned long addr)
-+{
-+ unsigned int ret;
-+
-+ ret = *(volatile u32 *)addr;
-+ eieio();
-+ return ret;
-+}
+ #include <linux/config.h>
+ #include <asm-m68k/amigahw.h>
+@@ -12,6 +12,29 @@
+ #define CHIP_PHYSADDR (0x004000)
+ #endif
+
++struct rtc_time;
+
-+static inline void z_writeb(unsigned int val, unsigned long addr)
-+{
-+ *(volatile u8 *)addr = val;
-+ eieio();
-+}
++extern void amiga_init_IRQ(void);
++extern int amiga_hwclk(int, struct rtc_time *);
++extern int amiga_set_clock_mmss (unsigned long nowtime);
++extern void config_amiga(void);
++extern void apus_setup_pci_ptrs(void);
+
-+static inline void z_writew(unsigned int val, unsigned long addr)
-+{
-+ *(volatile u16 *)addr = val;
-+ eieio();
-+}
++#define MACH_IS_AMIGA 1
++#define MACH_AMIGA 1
++#define NUM_MEMINFO 4
++
++struct mem_info {
++ unsigned long addr; /* physical address of memory chunk */
++ unsigned long size; /* length of memory chunk (in bytes) */
++};
++
++extern int num_memory; /* # of memory blocks found (and used) */
++extern int m68k_realnum_memory; /* real # of memory blocks found */
++extern struct mem_info memory[NUM_MEMINFO];/* memory description */
+
-+static inline void z_writel(unsigned int val,unsigned long addr)
-+{
-+ *(volatile u32 *)addr = val;
-+ eieio();
-+}
-
- #define z_memset_io(a,b,c) memset((void *)(a),(b),(c))
- #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
-@@ -19,7 +56,6 @@
- unsigned long flags);
-
- extern void *ioremap(unsigned long address, unsigned long size);
--extern void iounmap(void *addr);
-
- extern void *__ioremap(unsigned long address, unsigned long size,
- unsigned long flags);
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/head.S linux-2.6.13-apus/arch/ppc/kernel/head.S
---- linux-2.6.13/arch/ppc/kernel/head.S 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/head.S 2005-08-04 01:40:55.000000000 +0200
-@@ -353,6 +353,28 @@
- #if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)
- . = 0x100
- b __secondary_start_gemini
-+#elif defined(CONFIG_APUS)
-+ . = 0x100
-+ mfspr r4,SPRN_HID0
-+ li r3,0
-+ ori r3,r3,0xc000
-+ andc r4,r4,r3
-+ mtspr SPRN_HID0,r4
-+ isync
-+ sync
-+ lis r8,0x6170
-+ ori r8,r8,0x7573
-+ lis r9,0xfff0
-+ lwz r9,0x1f8(r9)
-+ lis r1,init_thread_union at ha
-+ addi r1,r1,init_thread_union at l
-+ addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
-+ subis r1,r1,KERNELBASE at h
-+ add r1,r1,r9
-+ mr r3,r8
-+ mr r4,r9
-+ mtlr r4
-+ blrl
- #else
- EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD)
- #endif
-@@ -408,7 +430,15 @@
- bne 1f /* if not, try to put a PTE */
- mfspr r4,SPRN_DAR /* into the hash table */
- rlwinm r3,r10,32-15,21,21 /* DSISR_STORE -> _PAGE_RW */
-+#ifndef CONFIG_APUS
- bl hash_page
-+#else
-+ lis r5,hash_page at h
-+ ori r5,r5,hash_page at l
-+ tophys(r5,r5)
-+ mtlr r5
-+ blrl
-+#endif
- 1: stw r10,_DSISR(r11)
- mr r5,r10
- mfspr r4,SPRN_DAR
-@@ -433,7 +463,15 @@
- beq 1f /* if so, try to put a PTE */
- li r3,0 /* into the hash table */
- mr r4,r12 /* SRR0 is fault address */
-+#ifndef CONFIG_APUS
- bl hash_page
-+#else
-+ lis r5,hash_page at h
-+ ori r5,r5,hash_page at l
-+ tophys(r5,r5)
-+ mtlr r5
-+ blrl
-+#endif
- 1: mr r4,r12
- mr r5,r9
- EXC_XFER_EE_LITE(0x400, handle_page_fault)
-@@ -1201,19 +1239,6 @@
- bl machine_init
- bl MMU_init
-
--#ifdef CONFIG_APUS
-- /* Copy exception code to exception vector base on APUS. */
-- lis r4,KERNELBASE at h
--#ifdef CONFIG_APUS_FAST_EXCEPT
-- lis r3,0xfff0 /* Copy to 0xfff00000 */
--#else
-- lis r3,0 /* Copy to 0x00000000 */
--#endif
-- li r5,0x4000 /* # bytes of memory to copy */
-- li r6,0
-- bl copy_and_flush /* copy the first 0x4000 bytes */
--#endif /* CONFIG_APUS */
--
- /*
- * Go back to running unmapped so we can load up new values
- * for SDR1 (hash table pointer) and the segment registers
-@@ -1231,6 +1256,22 @@
- /* Load up the kernel context */
- 2: bl load_up_mmu
-
-+#ifdef CONFIG_APUS
-+ /* Copy exception code to exception vector base on APUS. */
-+ lis r4,KERNELBASE at h
-+ tophys(r4,r4)
-+#ifdef CONFIG_APUS_FAST_EXCEPT
-+ lis r3,0xfff0 /* Copy to 0xfff00000 */
-+#else
-+ lis r3,0 /* Copy to 0x00000000 */
-+#endif
-+ lis r5,__head_end at h /* # bytes of memory to copy */
-+ ori r5,r5,__head_end at l
-+ subis r5,r5,KERNELBASE at h
-+ li r6,0
-+ bl copy_and_flush /* copy the first 0x4000 bytes */
-+#endif /* CONFIG_APUS */
-+
- #ifdef CONFIG_BDI_SWITCH
- /* Add helper information for the Abatron bdiGDB debugger.
- * We do this here because we know the mmu is disabled, and
-@@ -1411,6 +1452,17 @@
- mtspr SPRN_DBAT0U,r11 /* bit in upper BAT register */
- mtspr SPRN_IBAT0L,r8
- mtspr SPRN_IBAT0U,r11
-+#ifdef CONFIG_APUS
-+ /* map ZII space for early debug prints */
-+ lis r8,0x8000
-+ ori r8,r8,0x01ff
-+ mtspr SPRN_DBAT2U,r8
-+ mtspr SPRN_IBAT2U,r8
-+ lis r8,0x0000
-+ ori r8,r8,0x002a
-+ mtspr SPRN_DBAT2L,r8
-+ mtspr SPRN_IBAT2L,r8
-+#endif
- isync
- blr
-
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/setup.c linux-2.6.13-apus/arch/ppc/kernel/setup.c
---- linux-2.6.13/arch/ppc/kernel/setup.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/setup.c 2005-09-18 15:03:35.000000000 +0200
-@@ -542,6 +542,7 @@
- #endif /* CONFIG_SERIAL_CORE_CONSOLE */
- #endif /* CONFIG_PPC_MULTIPLATFORM */
-
-+#ifndef CONFIG_APUS
- struct bi_record *find_bootinfo(void)
- {
- struct bi_record *rec;
-@@ -588,6 +589,7 @@
- rec = (struct bi_record *)((ulong)rec + rec->size);
- }
- }
-+#endif
-
- /*
- * Find out what kind of machine we're on and save any data we need
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/time.c linux-2.6.13-apus/arch/ppc/kernel/time.c
---- linux-2.6.13/arch/ppc/kernel/time.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/time.c 2005-09-18 15:03:35.000000000 +0200
-@@ -153,6 +153,7 @@
- tb_last_stamp = jiffy_stamp;
- do_timer(regs);
-
-+#ifndef CONFIG_APUS
- /*
- * update the rtc when needed, this should be performed on the
- * right fraction of a second. Half or full second ?
-@@ -179,6 +180,7 @@
- /* Try again one minute later */
- last_rtc_update += 60;
- }
-+#endif
- write_sequnlock(&xtime_lock);
- }
- if ( !disarm_decr[smp_processor_id()] )
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/machdep.h linux-2.6.13-apus/include/asm-ppc/machdep.h
---- linux-2.6.13/include/asm-ppc/machdep.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/machdep.h 2005-09-18 15:03:36.000000000 +0200
-@@ -9,10 +9,6 @@
- #include <asm/setup.h>
- #include <asm/page.h>
-
--#ifdef CONFIG_APUS
--#include <asm-m68k/machdep.h>
--#endif
--
- struct pt_regs;
- struct pci_bus;
- struct pci_dev;
-diff -Nur -x CVS linux-2.6.13/include/asm-m68k/bootinfo.h linux-2.6.13-apus/include/asm-m68k/bootinfo.h
---- linux-2.6.13/include/asm-m68k/bootinfo.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-m68k/bootinfo.h 2005-07-30 22:49:24.000000000 +0200
-@@ -81,6 +81,8 @@
- #define BI_AMIGA_ECLOCK 0x8005 /* EClock frequency (u_long) */
- #define BI_AMIGA_CHIPSET 0x8006 /* native chipset present (u_long) */
- #define BI_AMIGA_SERPER 0x8007 /* serial port period (u_short) */
-+#define BI_AMIGA_PUP_BRIDGE 0x8008 /* powerup bridge (u_short) */
-+#define BI_AMIGA_BPPC_SCSI 0x8009 /* blizzard ppc scsi*/
-
- /*
- * Atari-specific tags
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/amigahw.h linux-2.6.13-apus/include/asm-ppc/amigahw.h
---- linux-2.6.13/include/asm-ppc/amigahw.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/amigahw.h 2004-07-03 19:59:46.000000000 +0200
-@@ -1,6 +1,6 @@
--#ifdef __KERNEL__
- #ifndef __ASMPPC_AMIGAHW_H
- #define __ASMPPC_AMIGAHW_H
-+#ifdef __KERNEL__
-
- #include <linux/config.h>
- #include <asm-m68k/amigahw.h>
-@@ -12,6 +12,13 @@
- #define CHIP_PHYSADDR (0x004000)
- #endif
-
-+struct rtc_time;
-+
-+extern void amiga_init_IRQ(void);
-+extern int amiga_hwclk(int, struct rtc_time *);
-+extern int amiga_set_clock_mmss (unsigned long nowtime);
-+extern void config_amiga(void);
-+extern void apus_setup_pci_ptrs(void);
++#define m68k_num_memory num_memory
++#define m68k_memory memory
-#endif /* __ASMPPC_AMIGAHW_H */
#endif /* __KERNEL__ */
+#endif /* __ASMPPC_AMIGAHW_H */
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/entry.S linux-2.6.13-apus/arch/ppc/kernel/entry.S
---- linux-2.6.13/arch/ppc/kernel/entry.S 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/entry.S 2005-09-18 15:03:35.000000000 +0200
-@@ -1000,3 +1000,6 @@
- /* XXX load up BATs and panic */
-
- #endif /* CONFIG_PPC_OF */
-+
-+ .global __head_end
-+__head_end:
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/bootinfo.h linux-2.6.13-apus/include/asm-ppc/bootinfo.h
---- linux-2.6.13/include/asm-ppc/bootinfo.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/bootinfo.h 2004-02-21 22:42:00.000000000 +0100
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/bootinfo.h linux-apus-2.6/include/asm-ppc/bootinfo.h
+--- linux-2.6.14/include/asm-ppc/bootinfo.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/bootinfo.h 2004-02-21 21:42:00.000000000 +0000
@@ -36,7 +36,6 @@
extern void bootinfo_init(struct bi_record *rec);
extern void bootinfo_append(unsigned long tag, unsigned long size, void * data);
@@ -2700,9 +3067,9 @@
#endif /* _PPC_BOOTINFO_H */
#endif /* __KERNEL__ */
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/current.h linux-2.6.13-apus/include/asm-ppc/current.h
---- linux-2.6.13/include/asm-ppc/current.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/current.h 2004-02-04 22:21:36.000000000 +0100
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/current.h linux-apus-2.6/include/asm-ppc/current.h
+--- linux-2.6.14/include/asm-ppc/current.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/current.h 2004-02-04 21:21:36.000000000 +0000
@@ -1,11 +1,11 @@
-#ifdef __KERNEL__
#ifndef _PPC_CURRENT_H
@@ -2717,199 +3084,9 @@
-#endif /* !(_PPC_CURRENT_H) */
#endif /* __KERNEL__ */
+#endif /* !(_PPC_CURRENT_H) */
-diff -Nur -x CVS linux-2.6.13/arch/ppc/mm/init.c linux-2.6.13-apus/arch/ppc/mm/init.c
---- linux-2.6.13/arch/ppc/mm/init.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/mm/init.c 2005-09-18 15:03:35.000000000 +0200
-@@ -61,9 +61,6 @@
- unsigned long total_memory;
- unsigned long total_lowmem;
-
--unsigned long ppc_memstart;
--unsigned long ppc_memoffset = PAGE_OFFSET;
--
- int mem_init_done;
- int init_bootmem_done;
- int boot_mapsize;
-diff -Nur -x CVS linux-2.6.13/arch/ppc/mm/Makefile linux-2.6.13-apus/arch/ppc/mm/Makefile
---- linux-2.6.13/arch/ppc/mm/Makefile 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/mm/Makefile 2004-09-25 23:09:43.000000000 +0200
-@@ -5,7 +5,8 @@
- obj-y := fault.o init.o mem_pieces.o \
- mmu_context.o pgtable.o
-
--obj-$(CONFIG_PPC_STD_MMU) += hashtable.o ppc_mmu.o tlb.o
-+extra-$(CONFIG_PPC_STD_MMU) := hashtable.o
-+obj-$(CONFIG_PPC_STD_MMU) += ppc_mmu.o tlb.o
- obj-$(CONFIG_40x) += 4xx_mmu.o
- obj-$(CONFIG_44x) += 44x_mmu.o
- obj-$(CONFIG_FSL_BOOKE) += fsl_booke_mmu.o
-diff -Nur -x CVS linux-2.6.13/arch/ppc/mm/pgtable.c linux-2.6.13-apus/arch/ppc/mm/pgtable.c
---- linux-2.6.13/arch/ppc/mm/pgtable.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/mm/pgtable.c 2005-09-18 15:03:35.000000000 +0200
-@@ -190,8 +190,8 @@
- * Don't allow anybody to remap normal RAM that we're using.
- * mem_init() sets high_memory so only do the check after that.
- */
-- if ( mem_init_done && (p < virt_to_phys(high_memory)) )
-- {
-+ if (mem_init_done && (p + size >= virt_to_phys(KERNELBASE)) &&
-+ (p < virt_to_phys(high_memory))) {
- printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
- __builtin_return_address(0));
- return NULL;
-@@ -429,42 +429,3 @@
-
- return(pa);
- }
--
--/* This is will find the virtual address for a physical one....
-- * Swiped from APUS, could be dangerous :-).
-- * This is only a placeholder until I really find a way to make this
-- * work. -- Dan
-- */
--unsigned long
--mm_ptov (unsigned long paddr)
--{
-- unsigned long ret;
--#if 0
-- if (paddr < 16*1024*1024)
-- ret = ZTWO_VADDR(paddr);
-- else {
-- int i;
--
-- for (i = 0; i < kmap_chunk_count;){
-- unsigned long phys = kmap_chunks[i++];
-- unsigned long size = kmap_chunks[i++];
-- unsigned long virt = kmap_chunks[i++];
-- if (paddr >= phys
-- && paddr < (phys + size)){
-- ret = virt + paddr - phys;
-- goto exit;
-- }
-- }
--
-- ret = (unsigned long) __va(paddr);
-- }
--exit:
--#ifdef DEBUGPV
-- printk ("PTOV(%lx)=%lx\n", paddr, ret);
--#endif
--#else
-- ret = (unsigned long)paddr + KERNELBASE;
--#endif
-- return ret;
--}
--
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/ppc_ksyms.c linux-2.6.13-apus/arch/ppc/kernel/ppc_ksyms.c
---- linux-2.6.13/arch/ppc/kernel/ppc_ksyms.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/ppc_ksyms.c 2005-09-18 15:03:35.000000000 +0200
-@@ -68,8 +68,6 @@
- long long __ashldi3(long long, int);
- long long __lshrdi3(long long, int);
-
--extern unsigned long mm_ptov (unsigned long paddr);
--
- EXPORT_SYMBOL(clear_pages);
- EXPORT_SYMBOL(clear_user_page);
- EXPORT_SYMBOL(do_signal);
-@@ -145,7 +143,6 @@
- EXPORT_SYMBOL(_insl_ns);
- EXPORT_SYMBOL(_outsl_ns);
- EXPORT_SYMBOL(iopa);
--EXPORT_SYMBOL(mm_ptov);
- EXPORT_SYMBOL(ioremap);
- #ifdef CONFIG_44x
- EXPORT_SYMBOL(ioremap64);
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/Makefile linux-2.6.13-apus/arch/ppc/kernel/Makefile
---- linux-2.6.13/arch/ppc/kernel/Makefile 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/Makefile 2005-09-18 15:03:35.000000000 +0200
-@@ -9,10 +9,11 @@
- extra-$(CONFIG_8xx) := head_8xx.o
- extra-$(CONFIG_6xx) += idle_6xx.o
- extra-$(CONFIG_POWER4) += idle_power4.o
-+extra-y += entry.o
- extra-$(CONFIG_PPC_FPU) += fpu.o
- extra-y += vmlinux.lds
-
--obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
-+obj-y := traps.o irq.o idle.o time.o misc.o \
- process.o signal.o ptrace.o align.o \
- semaphore.o syscalls.o setup.o \
- cputable.o ppc_htab.o perfmon.o
-diff -Nur -x CVS linux-2.6.13/arch/ppc/Makefile linux-2.6.13-apus/arch/ppc/Makefile
---- linux-2.6.13/arch/ppc/Makefile 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/Makefile 2005-09-18 15:03:35.000000000 +0200
-@@ -52,6 +52,8 @@
- head-$(CONFIG_44x) := arch/ppc/kernel/head_44x.o
- head-$(CONFIG_FSL_BOOKE) := arch/ppc/kernel/head_fsl_booke.o
-
-+head-y += arch/ppc/mm/hashtable.o
-+head-y += arch/ppc/kernel/entry.o
- head-$(CONFIG_6xx) += arch/ppc/kernel/idle_6xx.o
- head-$(CONFIG_POWER4) += arch/ppc/kernel/idle_power4.o
- head-$(CONFIG_PPC_FPU) += arch/ppc/kernel/fpu.o
-@@ -74,7 +76,9 @@
-
- .PHONY: $(BOOT_TARGETS)
-
-+ifndef CONFIG_APUS
- all: uImage zImage
-+endif
-
- CPPFLAGS_vmlinux.lds := -Upowerpc
-
-diff -Nur -x CVS linux-2.6.13/arch/ppc/kernel/misc.S linux-2.6.13-apus/arch/ppc/kernel/misc.S
---- linux-2.6.13/arch/ppc/kernel/misc.S 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/arch/ppc/kernel/misc.S 2005-09-18 15:03:35.000000000 +0200
-@@ -1377,7 +1377,11 @@
- .long sys_fstat64
- .long sys_pciconfig_read
- .long sys_pciconfig_write
-+#ifdef CONFIG_PCI
- .long sys_pciconfig_iobase /* 200 */
-+#else
-+ .long sys_ni_syscall
-+#endif
- .long sys_ni_syscall /* 201 - reserved - MacOnLinux - new */
- .long sys_getdents64
- .long sys_pivot_root
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/pgtable.h linux-2.6.13-apus/include/asm-ppc/pgtable.h
---- linux-2.6.13/include/asm-ppc/pgtable.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/pgtable.h 2005-09-18 15:03:36.000000000 +0200
-@@ -723,7 +723,7 @@
- #define pmd_page_kernel(pmd) \
- ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
- #define pmd_page(pmd) \
-- (mem_map + (pmd_val(pmd) >> PAGE_SHIFT))
-+ pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
- #else
- #define pmd_page_kernel(pmd) \
- ((unsigned long) (pmd_val(pmd) & PAGE_MASK))
-diff -Nur -x CVS linux-2.6.13/drivers/block/amiflop.c linux-2.6.13-apus/drivers/block/amiflop.c
---- linux-2.6.13/drivers/block/amiflop.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/drivers/block/amiflop.c 2005-07-31 01:06:43.000000000 +0200
-@@ -59,6 +59,7 @@
- #include <linux/hdreg.h>
- #include <linux/delay.h>
- #include <linux/init.h>
-+#include <linux/interrupt.h>
- #include <linux/amifdreg.h>
- #include <linux/amifd.h>
- #include <linux/buffer_head.h>
-diff -Nur -x CVS linux-2.6.13/arch/ppc/Kconfig linux-2.6.13-apus/arch/ppc/Kconfig
---- linux-2.6.13/arch/ppc/Kconfig 2005-08-28 23:41:01.000000000 +0000
-+++ linux-2.6.13-apus/arch/ppc/Kconfig 2005-09-25 07:08:31.000000000 +0000
-@@ -558,7 +576,6 @@
-
- config APUS
- bool "Amiga-APUS"
-- depends on BROKEN
- help
- Select APUS if configuring for a PowerUP Amiga.
- More information is available at:
-diff -Nur -x CVS linux-2.6.13/include/asm-ppc/io.h linux-2.6.13-apus/include/asm-ppc/io.h
---- linux-2.6.13/include/asm-ppc/io.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/asm-ppc/io.h 2005-07-31 03:18:36.000000000 +0200
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/include/asm-ppc/io.h
+--- linux-2.6.14/include/asm-ppc/io.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/io.h 2005-11-17 14:17:13.000000000 +0000
@@ -1,6 +1,6 @@
-#ifdef __KERNEL__
#ifndef _PPC_IO_H
@@ -3017,21 +3194,133 @@
#endif /* __KERNEL__ */
+#endif /* _PPC_IO_H */
-diff -Nur -x CVS linux-2.6.13/include/video/vga.h linux-2.6.13-apus/include/video/vga.h
---- linux-2.6.13/include/video/vga.h 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/include/video/vga.h 2005-07-30 20:52:54.000000000 +0200
-@@ -28,6 +28,9 @@
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/machdep.h linux-apus-2.6/include/asm-ppc/machdep.h
+--- linux-2.6.14/include/asm-ppc/machdep.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/machdep.h 2005-09-18 13:03:36.000000000 +0000
+@@ -9,10 +9,6 @@
+ #include <asm/setup.h>
+ #include <asm/page.h>
+
+-#ifdef CONFIG_APUS
+-#include <asm-m68k/machdep.h>
+-#endif
+-
+ struct pt_regs;
+ struct pci_bus;
+ struct pci_dev;
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/pgtable.h linux-apus-2.6/include/asm-ppc/pgtable.h
+--- linux-2.6.14/include/asm-ppc/pgtable.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/pgtable.h 2005-11-17 14:17:13.000000000 +0000
+@@ -723,7 +723,7 @@
+ #define pmd_page_kernel(pmd) \
+ ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+ #define pmd_page(pmd) \
+- (mem_map + (pmd_val(pmd) >> PAGE_SHIFT))
++ pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
+ #else
+ #define pmd_page_kernel(pmd) \
+ ((unsigned long) (pmd_val(pmd) & PAGE_MASK))
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/zorro.h linux-apus-2.6/include/asm-ppc/zorro.h
+--- linux-2.6.14/include/asm-ppc/zorro.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/asm-ppc/zorro.h 2005-08-03 23:48:26.000000000 +0000
+@@ -3,13 +3,50 @@
+
+ #include <asm/io.h>
+
+-#define z_readb in_8
+-#define z_readw in_be16
+-#define z_readl in_be32
+-
+-#define z_writeb(val, port) out_8((port), (val))
+-#define z_writew(val, port) out_be16((port), (val))
+-#define z_writel(val, port) out_be32((port), (val))
++static inline unsigned int z_readb(unsigned long addr)
++{
++ unsigned int ret;
++
++ ret = *(volatile u8 *)addr;
++ eieio();
++ return ret;
++}
++
++static inline unsigned int z_readw(unsigned long addr)
++{
++ unsigned int ret;
++
++ ret = *(volatile u16 *)addr;
++ eieio();
++ return ret;
++}
++
++static inline unsigned int z_readl(unsigned long addr)
++{
++ unsigned int ret;
++
++ ret = *(volatile u32 *)addr;
++ eieio();
++ return ret;
++}
++
++static inline void z_writeb(unsigned int val, unsigned long addr)
++{
++ *(volatile u8 *)addr = val;
++ eieio();
++}
++
++static inline void z_writew(unsigned int val, unsigned long addr)
++{
++ *(volatile u16 *)addr = val;
++ eieio();
++}
++
++static inline void z_writel(unsigned int val,unsigned long addr)
++{
++ *(volatile u32 *)addr = val;
++ eieio();
++}
+
+ #define z_memset_io(a,b,c) memset((void *)(a),(b),(c))
+ #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
+@@ -19,7 +56,6 @@
+ unsigned long flags);
+
+ extern void *ioremap(unsigned long address, unsigned long size);
+-extern void iounmap(void *addr);
+
+ extern void *__ioremap(unsigned long address, unsigned long size,
+ unsigned long flags);
+diff -Nur -x.gitignore -xCVS linux-2.6.14/include/video/vga.h linux-apus-2.6/include/video/vga.h
+--- linux-2.6.14/include/video/vga.h 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/include/video/vga.h 2005-07-30 18:52:54.000000000 +0000
+@@ -28,6 +28,7 @@
* Ugh, we don't have PCI space, so map readb() and friends to use Zorro space
* for MMIO accesses. This should make cirrusfb work again on Amiga
*/
-+#ifdef CONFIG_APUS
+#include <asm/zorro.h>
-+#endif
#undef inb_p
#undef inw_p
#undef outb_p
---- linux-2.6.13/sound/oss/dmasound/dmasound_paula.c 2005-08-29 01:41:01.000000000 +0200
-+++ linux-2.6.13-apus/sound/oss/dmasound/dmasound_paula.c 2005-09-25 21:50:11.000000000 +0200
+@@ -36,11 +37,17 @@
+ #undef writeb
+ #undef writew
+ #define inb_p(port) 0
++#undef inw_p
+ #define inw_p(port) 0
++#undef outb_p
+ #define outb_p(port, val) do { } while (0)
++#undef outw
+ #define outw(port, val) do { } while (0)
++#undef readb
+ #define readb z_readb
++#undef writeb
+ #define writeb z_writeb
++#undef writew
+ #define writew z_writew
+ #endif
+ #include <asm/byteorder.h>
+diff -Nur -x.gitignore -xCVS linux-2.6.14/sound/oss/dmasound/dmasound_paula.c linux-apus-2.6/sound/oss/dmasound/dmasound_paula.c
+--- linux-2.6.14/sound/oss/dmasound/dmasound_paula.c 2005-10-28 00:02:08.000000000 +0000
++++ linux-apus-2.6/sound/oss/dmasound/dmasound_paula.c 2005-09-24 21:15:20.000000000 +0000
@@ -244,6 +244,7 @@
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
@@ -3064,3 +3353,21 @@
return -EFAULT; \
data = convsample(data); \
*righth++ = data>>8; \
+diff -Nur -x.gitignore -xCVS linux-2.6.14/drivers/video/console/fonts.c linux-apus-2.6/drivers/video/console/fonts.c
+--- linux-2.6.14/drivers/video/console/fonts.c 2005-11-24 11:38:51.000000000 +0000
++++ linux-apus-2.6/drivers/video/console/fonts.c 2005-11-24 11:40:02.000000000 +0000
+@@ -118,7 +118,13 @@
+ for(i=0; i<num_fonts; i++) {
+ f = fonts[i];
+ c = f->pref;
+-#if defined(__mc68000__) || defined(CONFIG_APUS)
++#if defined(CONFIG_APUS)
++#ifdef CONFIG_FONT_PEARL_8x8
++ if (f->idx == PEARL8x8_IDX)
++ c = 100;
++#endif
++#endif
++#if defined(__mc68000__)
+ #ifdef CONFIG_FONT_PEARL_8x8
+ if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
+ c = 100;
Added: people/waldi/linux-2.6/debian/patches-debian/powerpc-arch-default-powerpc.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches-debian/powerpc-arch-default-powerpc.patch Sun Dec 4 11:44:32 2005
@@ -0,0 +1,18 @@
+#
+# Let's default to ARCH=powerpc, even in 32bit.
+# Author: David Woodhouse <david at woodhou.se>
+# Upstream status: upstream still uses ARCH=ppc on 32bit, but they have to
+# deal also with the embedded arches debian doesn't support.
+#
+
+--- linux-2.6.14/Makefile.orig 2005-11-19 17:13:52.000000000 +0000
++++ linux-2.6.14/Makefile 2005-11-19 17:14:04.000000000 +0000
+@@ -169,7 +169,7 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+ -e s/arm.*/arm/ -e s/sa110/arm/ \
+ -e s/s390x/s390/ -e s/parisc64/parisc/ \
+- -e s/ppc64/powerpc/ )
++ -e s/ppc.*/powerpc/ )
+
+ # Cross compiling and selecting different set of gcc/bin-utils
+ # ---------------------------------------------------------------------------
Added: people/waldi/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 Sun Dec 4 11:44:32 2005
@@ -0,0 +1,24 @@
++ fbdev-radeon-noaccel.patch
++ fs-asfs-2.patch
++ ia64-irq-affinity-upfix.patch
++ modular-ide.patch
++ modular-ide-pnp.patch
+#+ powerpc-calibrate-tau.patch
+#+ powerpc-g3-750cxe.patch
++ powerpc-mkvmlinuz-support.patch
++ powerpc-serial.patch
+#+ remove-references-to-removed-drivers.patch
++ sparc64-hme-lockup.patch
+#+ tty-locking-fixes9.patch
++ version.patch
+#+ powerpc-mv643xx-hotplug-support.patch
+#+ powerpc-apus.patch
+#+ s390-uaccess-const.patch
+#+ powerpc-build-links.patch
+#+ powerpc64-audit_sysctl-build.patch
++ m68k-bvme.patch
++ m68k-mvme147.patch
++ m68k-mvme16x.patch
++ m68k-spinlock.patch
++ sparc64-atyfb-xl-gr.patch
++ powerpc-arch-default-powerpc.patch
Modified: people/waldi/linux-2.6/debian/rules
==============================================================================
--- people/waldi/linux-2.6/debian/rules (original)
+++ people/waldi/linux-2.6/debian/rules Sun Dec 4 11:44:32 2005
@@ -27,7 +27,7 @@
@[ -d $@ ] || mkdir $@
orig: ../orig/linux-$(MAJOR)-$(VERSION)
- rsync --delete --exclude debian --exclude .svn -av ../orig/linux-$(MAJOR)-$(VERSION)/ .
+ rsync --delete --exclude debian --exclude .svn --link-dest=../orig/linux-$(MAJOR)-$(VERSION)/ -av ../orig/linux-$(MAJOR)-$(VERSION)/ .
../orig/linux-$(MAJOR)-$(VERSION):
if [ -f "../linux-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \
Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real (original)
+++ people/waldi/linux-2.6/debian/rules.real Sun Dec 4 11:44:32 2005
@@ -240,7 +240,7 @@
dh_testdir
dh_testroot
dh_install $(DH_OPTIONS) debian/arch '/usr/src/linux-headers-$(VERSION)/debian'
- echo $(FLAVOURS) >'/usr/src/linux-headers-$(VERSION)/flavours'
+ echo $(FLAVOURS) >'debian/linux-headers-$(VERSION)/usr/src/linux-headers-$(VERSION)/flavours'
dh_installdocs $(DH_OPTIONS)
dh_installchangelogs $(DH_OPTIONS)
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
More information about the Kernel-svn-changes
mailing list