rpms/kernel/devel linux-2.6-compile-fixes.patch, NONE, 1.1 kernel-2.6.spec, 1.1405, 1.1406 linux-2.6.0-compile.patch, 1.156, NONE linux-2.6.10-compile-fixes.patch, 1.11, NONE linux-2.6.11-compile-fixes.patch, 1.28, NONE linux-2.6.12-compile-fixes.patch, 1.7, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 29 00:06:19 UTC 2005
- Previous message (by thread): rpms/perl-DBD-Pg/devel .cvsignore, 1.11, 1.12 perl-DBD-Pg.spec, 1.19, 1.20 sources, 1.11, 1.12
- Next message (by thread): rpms/qt/FC-4 qt-x11-free-3.3.3-Punjabi.patch, NONE, 1.1 qt-x11-free-3.3.4-imm-key.patch, NONE, 1.1 qt.spec, 1.72, 1.73
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18554
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-compile-fixes.patch
Removed Files:
linux-2.6.0-compile.patch linux-2.6.10-compile-fixes.patch
linux-2.6.11-compile-fixes.patch
linux-2.6.12-compile-fixes.patch
Log Message:
concat all the compile fix patches together.
Still need to split out the 'not compile fix' parts of these diffs
to their own component parts, and push whatever is necessary upstream.
Also need to review whether all these are still needed.
linux-2.6-compile-fixes.patch:
linux-10000/arch/i386/Makefile | 4 ++--
linux-10000/arch/i386/kernel/Makefile | 6 +++---
linux-10000/arch/i386/kernel/nmi.c | 2 +-
linux-10000/arch/ppc64/Makefile | 2 +-
linux-10000/arch/ppc64/boot/Makefile | 3 +++
linux-10000/arch/x86_64/ia32/sys_ia32.c | 1 -
linux-10000/arch/x86_64/mm/init.c | 2 --
linux-10000/drivers/acpi/ec.c | 2 +-
linux-10000/drivers/net/acenic.c | 2 +-
linux-10000/drivers/pci/search.c | 2 +-
linux-10000/drivers/usb/storage/scsiglue.c | 2 +-
linux-10000/fs/open.c | 1 -
linux-10000/fs/proc/generic.c | 2 +-
linux-10000/include/linux/config.h | 4 +++-
linux-10000/include/linux/delay.h | 17 ++++++++---------
linux-10000/include/linux/gfp.h | 2 +-
linux-10000/include/linux/namei.h | 2 +-
linux-10000/init/Kconfig | 2 +-
linux-10000/kernel/pid.c | 2 +-
linux-10000/scripts/reference_discarded.pl | 3 ++-
linux-10000/scripts/reference_init.pl | 1 +
linux-10000/sound/core/oss/pcm_oss.c | 7 +++++++
linux-10001/arch/ppc/Makefile | 1 +
linux-10001/arch/ppc/kernel/head.S | 2 +-
linux-10001/arch/ppc/kernel/misc.S | 2 +-
linux-10001/arch/ppc/mm/hashtable.S | 4 ++--
linux-10001/arch/ppc/platforms/pmac_sleep.S | 2 +-
linux-10001/arch/ppc64/Makefile | 2 +-
linux-10001/arch/ppc64/boot/main.c | 1 +
linux-10001/crypto/Makefile | 2 ++
linux-10001/drivers/md/Makefile | 2 ++
linux-10001/include/asm-ppc/ppc_asm.h | 2 +-
linux-10001/include/linux/config.h | 2 +-
linux-10001/scripts/kconfig/Makefile | 2 +-
linux-10001/scripts/reference_discarded.pl | 1 +
linux-10001/sound/core/oss/Makefile | 1 +
linux-2.6.11/Makefile | 2 +-
linux-2.6.11/drivers/char/agp/hp-agp.c | 3 +--
linux-2.6.11/drivers/firmware/pcdp.c | 1 +
linux-2.6.11/drivers/scsi/ide-scsi.c | 7 ++++++-
linux-2.6.11/drivers/usb/storage/usb.c | 2 +-
linux-2.6.12/drivers/scsi/aacraid/commctrl.c | 2 +-
42 files changed, 68 insertions(+), 46 deletions(-)
--- NEW FILE linux-2.6-compile-fixes.patch ---
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/kernel/Makefile linux-10000/arch/i386/kernel/Makefile
--- linux-3022/arch/i386/kernel/Makefile
+++ linux-10000/arch/i386/kernel/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_HPET_TIMER) += time_hpet.o
obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-EXTRA_AFLAGS := -traditional
+EXTRA_AFLAGS := -traditional -m32
obj-$(CONFIG_SCx200) += scx200.o
@@ -51,7 +51,7 @@ quiet_cmd_syscall = SYSCALL $@
export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
-vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
+vsyscall-flags = -m32 -shared -s -Wl,-soname=linux-gate.so.1
SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags)
SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags)
@@ -67,7 +67,7 @@ extra-y += vsyscall-syms.o
$(obj)/built-in.o: $(obj)/vsyscall-syms.o
$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
-SYSCFLAGS_vsyscall-syms.o = -r
+SYSCFLAGS_vsyscall-syms.o = -m32 -r
$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
$(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
$(call if_changed,syscall)
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/kernel/nmi.c linux-10000/arch/i386/kernel/nmi.c
--- linux-3022/arch/i386/kernel/nmi.c
+++ linux-10000/arch/i386/kernel/nmi.c
@@ -491,7 +491,7 @@ void nmi_watchdog_tick (struct pt_regs *
* wait a few IRQs (5 seconds) before doing the oops ...
*/
alert_counter[cpu]++;
- if (alert_counter[cpu] == 5*nmi_hz)
+ if (alert_counter[cpu] == 30*nmi_hz)
die_nmi(regs, "NMI Watchdog detected LOCKUP");
} else {
last_irq_sums[cpu] = sum;
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/Makefile linux-10000/arch/i386/Makefile
--- linux-3022/arch/i386/Makefile
+++ linux-10000/arch/i386/Makefile
@@ -22,7 +22,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .c
LDFLAGS_vmlinux :=
CHECKFLAGS += -D__i386__
-CFLAGS += -pipe -msoft-float
+CFLAGS += -pipe -msoft-float -m32 -fno-builtin-sprintf -fno-builtin-log2 -fno-builtin-puts
# prevent gcc from keeping the stack 16 byte aligned
CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
@@ -118,7 +118,7 @@ drivers-$(CONFIG_OPROFILE) += arch/i386
drivers-$(CONFIG_PM) += arch/i386/power/
CFLAGS += $(mflags-y)
-AFLAGS += $(mflags-y)
+AFLAGS += $(mflags-y) -m32
boot := arch/i386/boot
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/ppc64/boot/Makefile linux-10000/arch/ppc64/boot/Makefile
--- linux-3022/arch/ppc64/boot/Makefile
+++ linux-10000/arch/ppc64/boot/Makefile
@@ -98,6 +98,9 @@ $(obj)/zImage: obj-boot += $(call obj-se
$(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE
$(call if_changed,addnote)
+$(obj)/zImage.stub: $(obj-boot) FORCE
+ $(BOOTLD) -r $(BOOTLFLAGS) -o $@ $(obj-boot)
+
$(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd))
$(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE
$(call if_changed,addnote)
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/ppc64/Makefile linux-10000/arch/ppc64/Makefile
--- linux-3022/arch/ppc64/Makefile
+++ linux-10000/arch/ppc64/Makefile
@@ -82,7 +82,7 @@ boot := arch/ppc64/boot
bzImage: vmlinux
cp vmlinux arch/ppc64/boot/bzImage
-boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
+boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd zImage.stub
boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
$(boottarget-y): vmlinux
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c
--- linux-3022/arch/x86_64/ia32/sys_ia32.c
+++ linux-10000/arch/x86_64/ia32/sys_ia32.c
@@ -1048,4 +1048,3 @@ static int __init ia32_init (void)
__initcall(ia32_init);
extern unsigned long ia32_sys_call_table[];
-EXPORT_SYMBOL(ia32_sys_call_table);
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/x86_64/mm/init.c linux-10000/arch/x86_64/mm/init.c
--- linux-3022/arch/x86_64/mm/init.c
+++ linux-10000/arch/x86_64/mm/init.c
@@ -461,8 +461,6 @@ void __init mem_init(void)
int tmp;
#ifdef CONFIG_SWIOTLB
- if (swiotlb_force)
- swiotlb = 1;
if (!iommu_aperture &&
(end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
swiotlb = 1;
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c
--- linux-3022/drivers/acpi/ec.c
+++ linux-10000/drivers/acpi/ec.c
@@ -640,7 +640,7 @@ acpi_ec_add (
acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit, &acpi_ec_gpe_handler);
- kfree(ec_ecdt);
+// kfree(ec_ecdt);
}
/* Get GPE bit assignment (EC events). */
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/net/acenic.c linux-10000/drivers/net/acenic.c
--- linux-3022/drivers/net/acenic.c
+++ linux-10000/drivers/net/acenic.c
@@ -443,7 +443,7 @@ MODULE_PARM_DESC(max_rx_desc, "AceNIC/3C
MODULE_PARM_DESC(tx_ratio, "AceNIC/3C985/GA620 ratio of NIC memory used for TX/RX descriptors (range 0-63)");
-static char version[] __devinitdata =
+static char version[] =
"acenic.c: v0.92 08/05/2002 Jes Sorensen, linux-acenic at SunSITE.dk\n"
" http://home.cern.ch/~jes/gige/acenic.html\n";
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/pci/search.c linux-10000/drivers/pci/search.c
--- linux-3022/drivers/pci/search.c
+++ linux-10000/drivers/pci/search.c
@@ -166,7 +166,7 @@ static struct pci_dev * pci_find_subsys(
struct list_head *n;
struct pci_dev *dev;
- WARN_ON(in_interrupt());
+ BUG_ON(in_interrupt());
spin_lock(&pci_bus_lock);
n = from ? from->global_list.next : pci_devices.next;
--- linux-2.6.11/drivers/scsi/ide-scsi.c~ 2005-03-22 19:21:13.000000000 -0500
+++ linux-2.6.11/drivers/scsi/ide-scsi.c 2005-03-22 19:21:51.000000000 -0500
@@ -764,6 +764,8 @@ static ide_driver_t idescsi_driver = {
.drives = LIST_HEAD_INIT(idescsi_driver.drives),
};
+static int ide_scsi_warned;
+
static int idescsi_ide_open(struct inode *inode, struct file *filp)
{
struct gendisk *disk = inode->i_bdev->bd_disk;
@@ -776,7 +778,10 @@ static int idescsi_ide_open(struct inode
drive = scsi->drive;
drive->usage++;
-
+ if (!ide_scsi_warned++) {
+ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n");
+ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n");
+ }
return 0;
}
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c
--- linux-3022/drivers/usb/storage/scsiglue.c
+++ linux-10000/drivers/usb/storage/scsiglue.c
@@ -469,7 +469,7 @@ struct scsi_host_template usb_stor_host_
.sg_tablesize = SG_ALL,
/* limit the total size of a transfer to 120 KB */
- .max_sectors = 240,
+ .max_sectors = 256,
/* merge commands... this seems to help performance, but
* periodically someone should test to see which setting is more
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/usb.c linux-10000/drivers/usb/storage/usb.c
--- linux-2.6.11/drivers/usb/storage/usb.c~ 2005-04-05 02:15:13.000000000 -0400
+++ linux-2.6.11/drivers/usb/storage/usb.c 2005-04-05 02:15:36.000000000 -0400
@@ -293,7 +293,7 @@ static int usb_stor_control_thread(void
* so get rid of all our resources.
*/
daemonize("usb-storage");
- current->flags |= PF_NOFREEZE;
+ current->flags |= PF_NOFREEZE|PF_MEMALLOC;
unlock_kernel();
/* acquire a reference to the host, so it won't be deallocated
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/open.c linux-10000/fs/open.c
--- linux-3022/fs/open.c
+++ linux-10000/fs/open.c
@@ -976,7 +976,6 @@ out_error:
fd = error;
goto out;
}
-EXPORT_SYMBOL_GPL(sys_open);
#ifndef __alpha__
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/fs/proc/generic.c linux-10000/fs/proc/generic.c
--- linux-3022/fs/proc/generic.c
+++ linux-10000/fs/proc/generic.c
@@ -690,7 +690,7 @@ void remove_proc_entry(const char *name,
parent->nlink--;
proc_kill_inodes(de);
de->nlink = 0;
- WARN_ON(de->subdir);
+ BUG_ON(de->subdir);
if (!atomic_read(&de->count))
free_proc_entry(de);
else {
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/config.h linux-10000/include/linux/config.h
--- linux-3022/include/linux/config.h
+++ linux-10000/include/linux/config.h
@@ -2,5 +2,7 @@
#define _LINUX_CONFIG_H
#include <linux/autoconf.h>
-
+#ifndef __KERNEL__
+#error including kernel header in userspace; use the glibc headers instead!
+#endif
#endif
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/delay.h linux-10000/include/linux/delay.h
--- linux-3022/include/linux/delay.h
+++ linux-10000/include/linux/delay.h
@@ -10,7 +10,7 @@
extern unsigned long loops_per_jiffy;
#include <asm/delay.h>
-
+#include <linux/hardirq.h>
/*
* Using udelay() for intervals greater than a few milliseconds can
* risk overflow for high loops_per_jiffy (high bogomips) machines. The
@@ -25,14 +25,13 @@ extern unsigned long loops_per_jiffy;
#define MAX_UDELAY_MS 5
#endif
-#ifdef notdef
-#define mdelay(n) (\
- {unsigned long __ms=(n); while (__ms--) udelay(1000);})
-#else
-#define mdelay(n) (\
- (__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : \
- ({unsigned long __ms=(n); while (__ms--) udelay(1000);}))
-#endif
+#define mdelay(n) ( \
+ { \
+ static int warned=0; \
+ unsigned long __ms=(n); \
+ WARN_ON(in_irq() && !(warned++)); \
+ while (__ms--) udelay(1000); \
+ })
#ifndef ndelay
#define ndelay(x) udelay(((x)+999)/1000)
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/gfp.h linux-10000/include/linux/gfp.h
--- linux-3022/include/linux/gfp.h
+++ linux-10000/include/linux/gfp.h
@@ -47,7 +47,7 @@ struct vm_area_struct;
__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \
__GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP)
-#define GFP_ATOMIC (__GFP_HIGH)
+#define GFP_ATOMIC (__GFP_HIGH | __GFP_NOWARN)
#define GFP_NOIO (__GFP_WAIT)
#define GFP_NOFS (__GFP_WAIT | __GFP_IO)
#define GFP_KERNEL (__GFP_WAIT | __GFP_IO | __GFP_FS)
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/namei.h linux-10000/include/linux/namei.h
--- linux-3022/include/linux/namei.h
+++ linux-10000/include/linux/namei.h
@@ -10,7 +10,7 @@ struct open_intent {
int create_mode;
};
-enum { MAX_NESTED_LINKS = 5 };
+enum { MAX_NESTED_LINKS = 8 };
struct nameidata {
struct dentry *dentry;
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/init/Kconfig linux-10000/init/Kconfig
--- linux-3022/init/Kconfig
+++ linux-10000/init/Kconfig
@@ -291,7 +291,7 @@ config EPOLL
support for epoll family of system calls.
config CC_OPTIMIZE_FOR_SIZE
- bool "Optimize for size" if EMBEDDED
+ bool "Optimize for size"
default y if ARM || H8300
help
Enabling this option will pass "-Os" instead of "-O2" to gcc
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/kernel/pid.c linux-10000/kernel/pid.c
--- linux-3022/kernel/pid.c
+++ linux-10000/kernel/pid.c
@@ -257,7 +257,7 @@ void __init pidhash_init(void)
int i, j, pidhash_size;
unsigned long megabytes = nr_kernel_pages >> (20 - PAGE_SHIFT);
- pidhash_shift = max(4, fls(megabytes * 4));
+ pidhash_shift = max(10, fls(megabytes * 4));
pidhash_shift = min(12, pidhash_shift);
pidhash_size = 1 << pidhash_shift;
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/scripts/reference_discarded.pl linux-10000/scripts/reference_discarded.pl
--- linux-3022/scripts/reference_discarded.pl
+++ linux-10000/scripts/reference_discarded.pl
@@ -88,6 +88,7 @@ foreach $object (keys(%object)) {
($from !~ /\.text\.exit$/ &&
$from !~ /\.exit\.text$/ &&
$from !~ /\.data\.exit$/ &&
+ $from !~ /\.opd$/ &&
$from !~ /\.exit\.data$/ &&
$from !~ /\.altinstructions$/ &&
$from !~ /\.pdr$/ &&
@@ -107,4 +108,4 @@ foreach $object (keys(%object)) {
}
# printf("Done\n");
-exit(0);
+exit($errorcount);
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/scripts/reference_init.pl linux-10000/scripts/reference_init.pl
--- linux-3022/scripts/reference_init.pl
+++ linux-10000/scripts/reference_init.pl
@@ -90,6 +90,7 @@ foreach $object (sort(keys(%object))) {
if (($line =~ /\.init$/ || $line =~ /\.init\./) &&
($from !~ /\.init$/ &&
$from !~ /\.init\./ &&
+ $from !~ /\.eh_frame$/ &&
$from !~ /\.stab$/ &&
$from !~ /\.rodata$/ &&
$from !~ /\.text\.lock$/ &&
diff -urNp --exclude-from=/home/davej/.exclude linux-3022/sound/core/oss/pcm_oss.c linux-10000/sound/core/oss/pcm_oss.c
--- linux-3022/sound/core/oss/pcm_oss.c
+++ linux-10000/sound/core/oss/pcm_oss.c
@@ -1815,6 +1815,13 @@ static int snd_pcm_oss_open(struct inode
snd_pcm_oss_setup_t *psetup = NULL, *csetup = NULL;
int nonblock;
wait_queue_t wait;
+ static char printed_comm[16];
+
+ if (strncmp(printed_comm, current->comm, 16)) {
+ printk(KERN_DEBUG "application %s uses obsolete OSS audio interface\n",
+ current->comm);
+ memcpy(printed_comm, current->comm, 16);
+ }
snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO);
device = SNDRV_MINOR_OSS_DEVICE(minor) == SNDRV_MINOR_OSS_PCM1 ?
--- linux-2.6.11/Makefile~ 2005-05-28 18:48:02.000000000 -0400
+++ linux-2.6.11/Makefile 2005-05-28 18:48:27.000000000 -0400
@@ -203,7 +203,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
HOSTCXX = g++
-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS = -Wall -Wundef -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCXXFLAGS = -O2
# Decide whether to build built-in, modular, or both.
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/head.S linux-10001/arch/ppc/kernel/head.S
--- linux-10000/arch/ppc/kernel/head.S
+++ linux-10001/arch/ppc/kernel/head.S
@@ -1512,7 +1512,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B
flush_tlbs:
lis r10, 0x40
1: addic. r10, r10, -0x1000
- tlbie r10
+ tlbie r10,0
blt 1b
sync
blr
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/kernel/misc.S linux-10001/arch/ppc/kernel/misc.S
--- linux-10000/arch/ppc/kernel/misc.S
+++ linux-10001/arch/ppc/kernel/misc.S
@@ -565,7 +565,7 @@ _GLOBAL(_tlbie)
SYNC_601
isync
#else /* CONFIG_SMP */
- tlbie r3
+ tlbie r3,0
sync
#endif /* CONFIG_SMP */
#endif /* ! CONFIG_40x */
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/Makefile linux-10001/arch/ppc/Makefile
--- linux-10000/arch/ppc/Makefile
+++ linux-10001/arch/ppc/Makefile
@@ -78,6 +78,7 @@ CPPFLAGS_vmlinux.lds := -Upowerpc
# All the instructions talk about "make bzImage".
bzImage: zImage
+ cp vmlinux arch/ppc/boot/bzImage
boot := arch/$(ARCH)/boot
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/mm/hashtable.S linux-10001/arch/ppc/mm/hashtable.S
--- linux-10000/arch/ppc/mm/hashtable.S
+++ linux-10001/arch/ppc/mm/hashtable.S
@@ -375,7 +375,7 @@ _GLOBAL(hash_page_patch_A)
*/
andi. r6,r6,_PAGE_HASHPTE
beq+ 10f /* no PTE: go look for an empty slot */
- tlbie r4
+ tlbie r4,0
addis r4,r7,htab_hash_searches at ha
lwz r6,htab_hash_searches at l(r4)
@@ -616,7 +616,7 @@ _GLOBAL(flush_hash_patch_B)
3: li r0,0
STPTE r0,0(r12) /* invalidate entry */
4: sync
- tlbie r4 /* in hw tlb too */
+ tlbie r4,0 /* in hw tlb too */
sync
8: ble cr1,9f /* if all ptes checked */
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/platforms/pmac_sleep.S linux-10001/arch/ppc/platforms/pmac_sleep.S
--- linux-10000/arch/ppc/platforms/pmac_sleep.S
+++ linux-10001/arch/ppc/platforms/pmac_sleep.S
@@ -340,7 +340,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_B
/* Flush all TLBs */
lis r4,0x1000
1: addic. r4,r4,-0x1000
- tlbie r4
+ tlbie r4, 0
blt 1b
sync
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/boot/main.c linux-10001/arch/ppc64/boot/main.c
--- linux-10000/arch/ppc64/boot/main.c
+++ linux-10001/arch/ppc64/boot/main.c
@@ -8,6 +8,7 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
+#define __KERNGLUE__
#include "ppc32-types.h"
#include "zlib.h"
#include <linux/elf.h>
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc64/Makefile linux-10001/arch/ppc64/Makefile
--- linux-10000/arch/ppc64/Makefile
+++ linux-10001/arch/ppc64/Makefile
@@ -68,7 +68,7 @@ endif
# Enable unit-at-a-time mode when possible. It shrinks the
# kernel considerably.
-CFLAGS += $(call cc-option,-funit-at-a-time)
+CFLAGS += $(call cc-option,-fno-unit-at-a-time)
head-y := arch/ppc64/kernel/head.o
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/crypto/Makefile linux-10001/crypto/Makefile
--- linux-10000/crypto/Makefile
+++ linux-10001/crypto/Makefile
@@ -35,3 +35,5 @@ obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/
obj-$(CONFIG_CRYPTO_MPILIB) += mpi/
+
+CFLAGS_twofish.o += -fno-schedule-insns
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/drivers/md/Makefile linux-10001/drivers/md/Makefile
--- linux-10000/drivers/md/Makefile
+++ linux-10001/drivers/md/Makefile
@@ -15,6 +15,8 @@ raid6-objs := raid6main.o raid6algos.o r
raid6mmx.o raid6sse1.o raid6sse2.o
hostprogs-y := mktables
+CFLAGS_raid6int8.o += -O2
+
# Note: link order is important. All raid personalities
# and xor.o must come before md.o, as they each initialise
# themselves, and md.o may use the personalities when it
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/asm-ppc/ppc_asm.h linux-10001/include/asm-ppc/ppc_asm.h
--- linux-10000/include/asm-ppc/ppc_asm.h
+++ linux-10001/include/asm-ppc/ppc_asm.h
@@ -116,7 +116,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
li r4,1024; \
mtctr r4; \
lis r4,KERNELBASE at h; \
-0: tlbie r4; \
+0: tlbie r4, 0; \
addi r4,r4,0x1000; \
bdnz 0b
#endif
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/include/linux/config.h linux-10001/include/linux/config.h
--- linux-10000/include/linux/config.h
+++ linux-10001/include/linux/config.h
@@ -2,7 +2,7 @@
#define _LINUX_CONFIG_H
#include <linux/autoconf.h>
-#ifndef __KERNEL__
+#if !defined (__KERNEL__) && !defined(__KERNGLUE__)
#error including kernel header in userspace; use the glibc headers instead!
#endif
#endif
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/scripts/kconfig/Makefile linux-10001/scripts/kconfig/Makefile
--- linux-10000/scripts/kconfig/Makefile
+++ linux-10001/scripts/kconfig/Makefile
@@ -126,7 +126,7 @@ QTLIBPATH = $(QTDIR)/lib
# QT needs some extra effort...
$(obj)/.tmp_qtcheck:
- @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+ @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt* /usr/lib64/qt* ; do \
if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
done; \
if [ -z "$$DIR" ]; then \
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/scripts/reference_discarded.pl linux-10001/scripts/reference_discarded.pl
--- linux-10000/scripts/reference_discarded.pl
+++ linux-10001/scripts/reference_discarded.pl
@@ -96,6 +96,7 @@ foreach $object (keys(%object)) {
$from !~ /\.debug_aranges$/ &&
$from !~ /\.debug_ranges$/ &&
$from !~ /\.debug_line$/ &&
+ $from !~ /\.debug_loc$/ &&
$from !~ /\.debug_frame$/ &&
$from !~ /\.exitcall\.exit$/ &&
$from !~ /\.eh_frame$/ &&
diff -urNp --exclude-from=/home/davej/.exclude linux-10000/sound/core/oss/Makefile linux-10001/sound/core/oss/Makefile
--- linux-10000/sound/core/oss/Makefile
+++ linux-10001/sound/core/oss/Makefile
@@ -3,6 +3,7 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex at suse.cz>
#
+CFLAGS_pcm_plugin.o += -g0
snd-mixer-oss-objs := mixer_oss.o
snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \
--- linux-2.6.11/drivers/firmware/pcdp.c~ 2005-05-28 19:12:41.000000000 -0400
+++ linux-2.6.11/drivers/firmware/pcdp.c 2005-05-28 19:12:51.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/console.h>
#include <linux/efi.h>
#include <linux/serial.h>
+#include <acpi/actypes.h>
#include "pcdp.h"
static int __init
--- linux-2.6.11/drivers/char/agp/hp-agp.c~ 2005-05-28 19:13:50.000000000 -0400
+++ linux-2.6.11/drivers/char/agp/hp-agp.c 2005-05-28 19:14:14.000000000 -0400
@@ -14,9 +14,8 @@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/agp_backend.h>
-
+#include <acpi/acpixf.h>
#include <asm/acpi-ext.h>
-
#include "agp.h"
#ifndef log2
--- linux-2.6.12/drivers/scsi/aacraid/commctrl.c~ 2005-06-20 20:43:12.000000000 -0400
+++ linux-2.6.12/drivers/scsi/aacraid/commctrl.c 2005-06-20 20:43:25.000000000 -0400
@@ -469,7 +469,7 @@ static int aac_send_raw_srb(struct aac_d
goto cleanup;
}
- user_srbcmd = kmalloc(GFP_KERNEL, fibsize);
+ user_srbcmd = kmalloc(fibsize, GFP_KERNEL);
if (!user_srbcmd) {
dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n"));
rcode = -ENOMEM;
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -u -r1.1405 -r1.1406
--- kernel-2.6.spec 28 Jun 2005 21:21:17 -0000 1.1405
+++ kernel-2.6.spec 29 Jun 2005 00:06:16 -0000 1.1406
@@ -364,11 +364,8 @@
# Not patches you're too lazy for to put in the proper place.
#
-Patch10000: linux-2.6.0-compile.patch
-Patch10001: linux-2.6.10-compile-fixes.patch
-Patch10002: linux-2.6.11-compile-fixes.patch
-Patch10003: linux-2.6.12-compile-fixes.patch
-Patch10004: linux-2.6.12-fortify_source.patch
+Patch10000: linux-2.6-compile-fixes.patch
+Patch10001: linux-2.6.12-fortify_source.patch
# END OF PATCH DEFINITIONS
@@ -823,10 +820,7 @@
# misc small stuff to make things compile or otherwise improve performance
#
%patch10000 -p1
-%patch10001 -p1
-%patch10002 -p1
-%patch10003 -p1
-#%patch10003 -p1
+#%patch10001 -p1
# END OF PATCH APPLICATIONS
--- linux-2.6.0-compile.patch DELETED ---
--- linux-2.6.10-compile-fixes.patch DELETED ---
--- linux-2.6.11-compile-fixes.patch DELETED ---
--- linux-2.6.12-compile-fixes.patch DELETED ---
- Previous message (by thread): rpms/perl-DBD-Pg/devel .cvsignore, 1.11, 1.12 perl-DBD-Pg.spec, 1.19, 1.20 sources, 1.11, 1.12
- Next message (by thread): rpms/qt/FC-4 qt-x11-free-3.3.3-Punjabi.patch, NONE, 1.1 qt-x11-free-3.3.4-imm-key.patch, NONE, 1.1 qt.spec, 1.72, 1.73
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list