debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fixed apus patch, and reenabled it. 

svn path=/dists/trunk/linux-2.6/; revision=5124
This commit is contained in:
Sven Luther 2005-12-29 09:53:49 +00:00
parent f3933e94b3
commit 69a5a479fc
3 changed files with 198 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -40,7 +40,12 @@ linux-2.6 (2.6.14+2.6.15-rc7-0experimental.1) UNRELEASED; urgency=low
* [arm] Compile ext3 support into the kernel on Footbridge.
* [arm] Turn on CONFIG_SERIAL_8250 support on Footbridge.
-- Jonas Smedegaard <dr@jones.dk> Thu, 29 Dec 2005 02:50:37 +0100
[ Sven Luther ]
* [powerpc] Fixed apus patch for 2.6.15-rc7 (and beyond hopefully).
* [powerpc] Fixed config options, but i guess jonas broke it again with his
cleanup, oh well :)
-- Sven Luther <luther@debian.org> Thu, 29 Dec 2005 09:48:36 +0000
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low

346
debian/patches-debian/powerpc-apus.patch vendored
View File

@ -10,9 +10,9 @@
# i will not apply by default.
#
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Kconfig linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Kconfig
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Kconfig 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Kconfig 2005-12-29 09:27:43.000000000 +0000
@@ -537,7 +537,6 @@
config APUS
@ -21,10 +21,10 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Kconfig linux-apus-2.6/arch/p
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 @@
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Makefile linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Makefile
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Makefile 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Makefile 2005-12-29 09:29:44.000000000 +0000
@@ -59,9 +59,12 @@
head-$(CONFIG_44x) := arch/ppc/kernel/head_44x.o
head-$(CONFIG_FSL_BOOKE) := arch/ppc/kernel/head_fsl_booke.o
@ -32,12 +32,12 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Makefile linux-apus-2.6/arch/
+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-$(CONFIG_PPC_FPU) += arch/powerpc/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 @@
core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \
arch/ppc/platforms/ \
@@ -84,7 +87,9 @@
.PHONY: $(BOOT_TARGETS)
@ -47,9 +47,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Makefile linux-apus-2.6/arch/
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/Makefile linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/Makefile
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/Makefile 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/Makefile 2005-12-29 09:27:43.000000000 +0000
@@ -1,8 +1,8 @@
#
-# Makefile for Linux arch/m68k/amiga source directory
@ -62,9 +62,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/Makefile linux-apus-2.6
+ 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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/amiints.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/amiints.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/amiints.c 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/amiints.c 2005-12-29 09:27:43.000000000 +0000
@@ -67,9 +67,10 @@
static short ami_ablecount[AMI_IRQS];
@ -138,9 +138,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/amiints.c linux-apus-2.
}
#ifdef CONFIG_APUS
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/bootinfo.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/bootinfo.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/bootinfo.c 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/bootinfo.c 2005-12-29 09:27:44.000000000 +0000
@@ -13,8 +13,9 @@
#include <asm/setup.h>
@ -177,9 +177,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/bootinfo.c linux-apus-2
}
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/cia.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/cia.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/cia.c 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/cia.c 2005-12-29 09:27:44.000000000 +0000
@@ -134,7 +134,7 @@
return cia_able_irq_private(base, mask);
}
@ -197,9 +197,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/cia.c linux-apus-2.6/ar
}
void __init cia_init_IRQ(struct ciabase *base)
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/config.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/config.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/config.c 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/config.c 2005-12-29 09:27:44.000000000 +0000
@@ -20,11 +20,12 @@
#include <linux/mm.h>
#include <linux/kd.h>
@ -687,9 +687,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/config.c linux-apus-2.6
return(len);
}
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/time.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/time.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/time.c 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/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>
@ -749,9 +749,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/time.c linux-apus-2.6/a
- /* should be made smarter */
- ppc_md.heartbeat_count = 1;
-}
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/configs/apus_defconfig linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/configs/apus_defconfig
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/configs/apus_defconfig 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/configs/apus_defconfig 2005-12-29 09:27:44.000000000 +0000
@@ -1,103 +1,139 @@
#
# Automatically generated make config: don't edit
@ -2227,25 +2227,24 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/configs/apus_defconfig linux-
+#
+# Hardware crypto devices
+#
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 @@
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/Makefile linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/Makefile
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/Makefile 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/Makefile 2005-12-29 09:30:41.000000000 +0000
@@ -10,9 +10,10 @@
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
-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
-obj-y := entry.o traps.o idle.o time.o misc.o \
+obj-y := traps.o idle.o time.o misc.o \
process.o \
setup.o \
ppc_htab.o
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/head.S linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/head.S
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/head.S 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/head.S 2005-12-29 09:27:44.000000000 +0000
@@ -353,6 +353,28 @@
#if defined(CONFIG_GEMINI) && defined(CONFIG_SMP)
. = 0x100
@ -2273,7 +2272,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head.S linux-apus-2.6/
+ mtlr r4
+ blrl
#else
EXCEPTION(0x100, Reset, UnknownException, EXC_XFER_STD)
EXCEPTION(0x100, Reset, unknown_exception, EXC_XFER_STD)
#endif
@@ -408,7 +430,15 @@
bne 1f /* if not, try to put a PTE */
@ -2307,7 +2306,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head.S linux-apus-2.6/
1: mr r4,r12
mr r5,r9
EXC_XFER_EE_LITE(0x400, handle_page_fault)
@@ -1199,19 +1237,6 @@
@@ -1193,19 +1231,6 @@
bl machine_init
bl MMU_init
@ -2327,7 +2326,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head.S linux-apus-2.6/
/*
* 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 @@
@@ -1223,6 +1248,22 @@
/* Load up the kernel context */
2: bl load_up_mmu
@ -2350,7 +2349,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head.S linux-apus-2.6/
#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 @@
@@ -1403,6 +1444,17 @@
mtspr SPRN_DBAT0U,r11 /* bit in upper BAT register */
mtspr SPRN_IBAT0L,r8
mtspr SPRN_IBAT0U,r11
@ -2368,16 +2367,16 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/head.S linux-apus-2.6/
isync
blr
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/head_end.S linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/head_end.S
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/head_end.S 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/head_end.S 2005-12-29 09:27:44.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 @@
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/misc.S linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/misc.S
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/misc.S 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/misc.S 2005-12-29 09:27:44.000000000 +0000
@@ -1325,7 +1325,11 @@
.long sys_fstat64
.long sys_pciconfig_read
.long sys_pciconfig_write
@ -2389,9 +2388,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/misc.S linux-apus-2.6/
.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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/ppc_ksyms.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/ppc_ksyms.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/ppc_ksyms.c 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/ppc_ksyms.c 2005-12-29 09:27:44.000000000 +0000
@@ -65,8 +65,6 @@
long long __ashldi3(long long, int);
long long __lshrdi3(long long, int);
@ -2401,7 +2400,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/ppc_ksyms.c linux-apus
EXPORT_SYMBOL(clear_pages);
EXPORT_SYMBOL(clear_user_page);
EXPORT_SYMBOL(do_signal);
@@ -142,7 +140,6 @@
@@ -146,7 +144,6 @@
EXPORT_SYMBOL(_insl_ns);
EXPORT_SYMBOL(_outsl_ns);
EXPORT_SYMBOL(iopa);
@ -2409,10 +2408,10 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/ppc_ksyms.c linux-apus
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 @@
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/setup.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/setup.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/setup.c 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/setup.c 2005-12-29 09:27:44.000000000 +0000
@@ -566,6 +566,7 @@
#endif /* CONFIG_SERIAL_CORE_CONSOLE */
#endif /* CONFIG_PPC_MULTIPLATFORM */
@ -2420,7 +2419,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/setup.c linux-apus-2.6
struct bi_record *find_bootinfo(void)
{
struct bi_record *rec;
@@ -592,6 +593,7 @@
@@ -624,6 +625,7 @@
rec = (struct bi_record *)((ulong)rec + rec->size);
}
}
@ -2428,10 +2427,10 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/setup.c linux-apus-2.6
/*
* 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 @@
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/time.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/time.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/kernel/time.c 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/kernel/time.c 2005-12-29 09:27:44.000000000 +0000
@@ -156,6 +156,7 @@
tb_last_stamp = jiffy_stamp;
do_timer(regs);
@ -2439,7 +2438,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/time.c linux-apus-2.6/
/*
* update the rtc when needed, this should be performed on the
* right fraction of a second. Half or full second ?
@@ -178,6 +179,7 @@
@@ -182,6 +183,7 @@
/* Try again one minute later */
last_rtc_update += 60;
}
@ -2447,9 +2446,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/kernel/time.c linux-apus-2.6/
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/mm/Makefile linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/mm/Makefile
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/mm/Makefile 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/mm/Makefile 2005-12-29 09:27:44.000000000 +0000
@@ -5,7 +5,8 @@
obj-y := fault.o init.o mem_pieces.o \
mmu_context.o pgtable.o
@ -2460,9 +2459,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/Makefile linux-apus-2.6/ar
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/mm/init.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/mm/init.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/mm/init.c 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/mm/init.c 2005-12-29 09:27:44.000000000 +0000
@@ -61,9 +61,6 @@
unsigned long total_memory;
unsigned long total_lowmem;
@ -2473,9 +2472,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/init.c linux-apus-2.6/arch
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/mm/pgtable.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/mm/pgtable.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/mm/pgtable.c 2005-12-25 12:11:25.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/mm/pgtable.c 2005-12-29 09:27:45.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.
@ -2487,7 +2486,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/pgtable.c linux-apus-2.6/a
printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
__builtin_return_address(0));
return NULL;
@@ -429,42 +429,3 @@
@@ -427,42 +427,3 @@
return(pa);
}
@ -2530,9 +2529,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/mm/pgtable.c linux-apus-2.6/a
- 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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/platforms/apus_setup.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/platforms/apus_setup.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/platforms/apus_setup.c 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/platforms/apus_setup.c 2005-12-29 09:27:45.000000000 +0000
@@ -17,11 +17,14 @@
#include <linux/kernel.h>
#include <linux/sched.h>
@ -2983,9 +2982,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/platforms/apus_setup.c linux-
ppc_memoffset = PAGE_OFFSET - PPC_MEMSTART;
total = memory[0].size;
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/drivers/block/amiflop.c linux-2.6-2.6.14+2.6.15-rc7/drivers/block/amiflop.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/drivers/block/amiflop.c 2005-12-25 12:11:26.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/drivers/block/amiflop.c 2005-12-29 09:27:45.000000000 +0000
@@ -59,6 +59,7 @@
#include <linux/hdreg.h>
#include <linux/delay.h>
@ -2994,9 +2993,27 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/drivers/block/amiflop.c linux-apus-2.6
#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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/drivers/video/console/fonts.c linux-2.6-2.6.14+2.6.15-rc7/drivers/video/console/fonts.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/drivers/video/console/fonts.c 2005-11-20 13:51:30.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/drivers/video/console/fonts.c 2005-12-29 09:27:45.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;
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-m68k/bootinfo.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-m68k/bootinfo.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-m68k/bootinfo.h 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-m68k/bootinfo.h 2005-12-29 09:27:45.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) */
@ -3006,9 +3023,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-m68k/bootinfo.h linux-apus
/*
* 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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/amigahw.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/amigahw.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/amigahw.h 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/amigahw.h 2005-12-29 09:27:45.000000000 +0000
@@ -1,6 +1,6 @@
-#ifdef __KERNEL__
#ifndef __ASMPPC_AMIGAHW_H
@ -3048,9 +3065,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/amigahw.h linux-apus-2
-#endif /* __ASMPPC_AMIGAHW_H */
#endif /* __KERNEL__ */
+#endif /* __ASMPPC_AMIGAHW_H */
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/bootinfo.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/bootinfo.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/bootinfo.h 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/bootinfo.h 2005-12-29 09:27:45.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);
@ -3067,26 +3084,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/bootinfo.h linux-apus-
#endif /* _PPC_BOOTINFO_H */
#endif /* __KERNEL__ */
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
#define _PPC_CURRENT_H
+#ifdef __KERNEL__
/*
* We keep `current' in r2 for speed.
*/
register struct task_struct *current asm ("r2");
-#endif /* !(_PPC_CURRENT_H) */
#endif /* __KERNEL__ */
+#endif /* !(_PPC_CURRENT_H) */
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/io.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/io.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/io.h 2005-12-25 12:11:28.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/io.h 2005-12-29 09:27:45.000000000 +0000
@@ -1,6 +1,6 @@
-#ifdef __KERNEL__
#ifndef _PPC_IO_H
@ -3095,7 +3095,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/in
#include <linux/config.h>
#include <linux/string.h>
@@ -294,10 +294,10 @@
@@ -297,10 +297,10 @@
__do_out_asm(outb, "stbx")
#ifdef CONFIG_APUS
__do_in_asm(inb, "lbzx")
@ -3110,7 +3110,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/in
#elif defined (CONFIG_8260_PCI9)
/* in asm cannot be defined if PCI9 workaround is used */
#define inb(port) in_8((port)+___IO_BASE)
@@ -377,12 +377,19 @@
@@ -380,12 +380,19 @@
extern void __iomem *ioremap64(unsigned long long address, unsigned long size);
#endif
#define ioremap_nocache(addr, size) ioremap((addr), (size))
@ -3130,7 +3130,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/in
/*
* The PCI bus is inherently Little-Endian. The PowerPC is being
* run Big-Endian. Thus all values which cross the [PCI] barrier
@@ -392,24 +399,16 @@
@@ -395,24 +402,16 @@
*/
extern inline unsigned long virt_to_bus(volatile void * address)
{
@ -3157,7 +3157,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/in
}
/*
@@ -418,20 +417,12 @@
@@ -421,20 +420,12 @@
*/
extern inline unsigned long virt_to_phys(volatile void * address)
{
@ -3180,7 +3180,7 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/in
}
/*
@@ -546,8 +537,6 @@
@@ -539,8 +530,6 @@
extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
@ -3189,14 +3189,14 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/io.h linux-apus-2.6/in
#ifdef CONFIG_8260_PCI9
#include <asm/mpc8260_pci9.h>
#endif
@@ -564,3 +553,4 @@
@@ -574,3 +563,4 @@
#define xlate_dev_kmem_ptr(p) p
#endif /* __KERNEL__ */
+#endif /* _PPC_IO_H */
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/machdep.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/machdep.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/machdep.h 2005-12-25 12:11:28.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/machdep.h 2005-12-29 09:27:45.000000000 +0000
@@ -9,10 +9,6 @@
#include <asm/setup.h>
#include <asm/page.h>
@ -3208,10 +3208,10 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/machdep.h linux-apus-2
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 @@
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/pgtable.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/pgtable.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/pgtable.h 2005-12-25 12:11:28.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/pgtable.h 2005-12-29 09:27:45.000000000 +0000
@@ -724,7 +724,7 @@
#define pmd_page_kernel(pmd) \
((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
#define pmd_page(pmd) \
@ -3220,9 +3220,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/pgtable.h linux-apus-2
#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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/zorro.h linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/zorro.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/asm-ppc/zorro.h 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/asm-ppc/zorro.h 2005-12-29 09:27:45.000000000 +0000
@@ -3,13 +3,50 @@
#include <asm/io.h>
@ -3289,9 +3289,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/asm-ppc/zorro.h linux-apus-2.6
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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/include/video/vga.h linux-2.6-2.6.14+2.6.15-rc7/include/video/vga.h
--- linux-2.6-2.6.14+2.6.15-rc7.orig/include/video/vga.h 2005-10-28 00:02:08.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/include/video/vga.h 2005-12-29 09:27:45.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
@ -3318,9 +3318,9 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/include/video/vga.h linux-apus-2.6/inc
#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
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/sound/oss/dmasound/dmasound_paula.c linux-2.6-2.6.14+2.6.15-rc7/sound/oss/dmasound/dmasound_paula.c
--- linux-2.6-2.6.14+2.6.15-rc7.orig/sound/oss/dmasound/dmasound_paula.c 2005-12-25 12:11:33.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/sound/oss/dmasound/dmasound_paula.c 2005-12-29 09:27:45.000000000 +0000
@@ -244,6 +244,7 @@
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
@ -3353,21 +3353,57 @@ diff -Nur -x.gitignore -xCVS linux-2.6.14/sound/oss/dmasound/dmasound_paula.c li
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;
diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/sven linux-2.6-2.6.14+2.6.15-rc7/sven
--- linux-2.6-2.6.14+2.6.15-rc7.orig/sven 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6-2.6.14+2.6.15-rc7/sven 2005-12-29 09:31:10.000000000 +0000
@@ -0,0 +1,50 @@
+patching file arch/ppc/Kconfig
+patching file arch/ppc/amiga/Makefile
+patching file arch/ppc/amiga/amiints.c
+patching file arch/ppc/amiga/bootinfo.c
+patching file arch/ppc/amiga/cia.c
+patching file arch/ppc/amiga/config.c
+patching file arch/ppc/amiga/time.c
+patching file arch/ppc/configs/apus_defconfig
+patching file arch/ppc/kernel/Makefile
+Hunk #1 succeeded at 353 with fuzz 2.
+Hunk #4 succeeded at 1231 (offset -6 lines).
+Hunk #5 succeeded at 1248 (offset -6 lines).
+Hunk #6 succeeded at 1444 (offset -6 lines).
+patching file arch/ppc/kernel/head_end.S
+patching file arch/ppc/kernel/misc.S
+Hunk #1 succeeded at 1325 (offset -52 lines).
+patching file arch/ppc/kernel/ppc_ksyms.c
+Hunk #2 succeeded at 144 (offset 4 lines).
+patching file arch/ppc/kernel/setup.c
+Hunk #1 succeeded at 566 (offset 20 lines).
+Hunk #2 succeeded at 625 (offset 32 lines).
+patching file arch/ppc/kernel/time.c
+Hunk #1 succeeded at 156 (offset 4 lines).
+Hunk #2 succeeded at 183 (offset 4 lines).
+patching file arch/ppc/mm/Makefile
+patching file arch/ppc/mm/init.c
+patching file arch/ppc/mm/pgtable.c
+Hunk #2 succeeded at 427 (offset -2 lines).
+patching file arch/ppc/platforms/apus_setup.c
+patching file drivers/block/amiflop.c
+patching file include/asm-m68k/bootinfo.h
+patching file include/asm-ppc/amigahw.h
+patching file include/asm-ppc/bootinfo.h
+patching file include/asm-powerpc/current.h
+Hunk #1 FAILED at 1.
+1 out of 1 hunk FAILED -- saving rejects to file include/asm-powerpc/current.h.rej
+patching file include/asm-ppc/io.h
+Hunk #2 succeeded at 297 (offset 3 lines).
+Hunk #3 succeeded at 380 (offset 3 lines).
+Hunk #4 succeeded at 402 (offset 3 lines).
+Hunk #5 succeeded at 420 (offset 3 lines).
+Hunk #6 succeeded at 530 (offset -7 lines).
+Hunk #7 succeeded at 563 (offset 10 lines).
+patching file include/asm-ppc/machdep.h
+patching file include/asm-ppc/pgtable.h
+Hunk #1 succeeded at 724 (offset 1 line).
+patching file include/asm-ppc/zorro.h
+patching file include/video/vga.h
+patching file sound/oss/dmasound/dmasound_paula.c
+patching file drivers/video/console/fonts.c

2
debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 vendored
View File

@ -11,7 +11,7 @@
#+ tty-locking-fixes9.patch
+ version.patch
#+ powerpc-mv643xx-hotplug-support.patch
#+ powerpc-apus.patch
+ powerpc-apus.patch
#+ s390-uaccess-const.patch
#+ powerpc-build-links.patch
#+ powerpc64-audit_sysctl-build.patch