[kernel] r4880 - in dists/sid/linux-2.6/debian: . patches-debian
patches-debian/series
Sven Luther
luther at costa.debian.org
Thu Nov 24 11:15:49 UTC 2005
Author: luther
Date: Thu Nov 24 11:15:48 2005
New Revision: 4880
Removed:
dists/sid/linux-2.6/debian/patches-debian/powerpc-apus-todo.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch
dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4
Log:
Reenabled powerpc/apus patch, not yet enabled it as default build though.
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Thu Nov 24 11:15:48 2005
@@ -14,9 +14,11 @@
[SECURITY] ctnetlink: check if protoinfo is present (local DoS)
* ctnetlink-fix-oops-when-no-icmp-id-info-in-message.patch
[SECURITY] ctnetlink: Fix oops when no ICMP ID info in message (local DoS)
-
- -- Simon Horman <horms at debian.org> Thu, 24 Nov 2005 16:22:33 +0900
+ [ Sven Luther ]
+ * Re-added powerpc/apus patch, now that Roman Zippel merged it in.
+
+ -- Sven Luther <luther at debian.org> Thu, 24 Nov 2005 11:11:36 +0000
linux-2.6 (2.6.14-3) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch (original)
+++ dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch Thu Nov 24 11:15:48 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) \
Modified: dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4 (original)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4 Thu Nov 24 11:15:48 2005
@@ -2,3 +2,4 @@
+ setkeys-needs-root-2.patch
+ mm-invalidate_inode_pages2-overflow.patch
+ ctnetlink-check-if-protoinfo-is-present.patch
++ powerpc-apus.patch
More information about the Kernel-svn-changes
mailing list