Update to 2.6.13-rc6.
* debian/changelog: Update. * debian/patches-debian/amd64-outs.patch: Remove, unreferenced. * debian/patches-debian/drivers-ide-__devinit.patch, debian/patches-debian/ia64-generic-nosmp.patch * debian/patches-debian/drivers-scsi-megaraid_splitup.patch, debian/patches-debian/modular-ide-pnp.patch, debian/patches-debian/remove-references-to-removed-drivers.patch, debian/patches-debian/modular-ide-pnp.patch: Update. * debian/patches-debian/patch-2.6.12.1, debian/patches-debian/patch-2.6.12.2 debian/patches-debian/patch-2.6.12.3, debian/patches-debian/patch-2.6.12.4 debian/patches-debian/patch-2.6.12.5: Remove, obselete. * debian/patches-debian/powerpc-ppc64-ibmvscsi.patch: Remove, broken. * debian/patches-debian/powerpc-ppc64-vio-data.patch: Add. * debian/patches-debian/series/2.6.12-1, debian/patches-debian/series/2.6.12-2, debian/patches-debian/series/2.6.12-3: Remove. * debian/patches-debian/series/2.6.12+2.6.13-rc6-1: Add. * debian/rules - Add maintainerclean rule. - Support versions with more than one dash. svn path=/trunk/kernel/linux-2.6/; revision=3989
This commit is contained in:
Bastian Blank
parent
76a9a81e0a
commit
bc4f67cc81
|
|
@ -1,3 +1,9 @@
|
|||
linux-2.6 (2.6.12+2.6.13-rc6-1) UNRELEASED; urgency=low
|
||||
|
||||
*
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Fri, 19 Aug 2005 16:20:36 +0200
|
||||
|
||||
linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
|
||||
|
||||
* [powerpc]
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
#! /bin/sh -e
|
||||
## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: Description: [CAN-2005-0204]: AMD64, allows local users to write to privileged IO ports via OUTS instruction
|
||||
## DP: Patch author: Suresh Siddha (suresh.b.siddha@intel.com)
|
||||
## DP: Upstream status: unknown
|
||||
## DP: URL: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146244
|
||||
## DP: Patch source: Micah Anderson <micah@riseup.net> (debian-kernel)
|
||||
|
||||
. $(dirname $0)/DPATCH
|
||||
|
||||
@DPATCH@
|
||||
--- linux-2.6.9/include/asm-x86_64/desc.h 2005-01-30 20:08:12.799247944 -0800
|
||||
+++ linux-2.6.9/include/asm-x86_64/desc.h 2005-01-30 20:08:12.799247944 -0800
|
||||
@@ -128,7 +128,7 @@
|
||||
{
|
||||
set_tssldt_descriptor(&cpu_gdt_table[cpu][GDT_ENTRY_TSS], (unsigned long)addr,
|
||||
DESC_TSS,
|
||||
- sizeof(struct tss_struct) - 1);
|
||||
+ IO_BITMAP_OFFSET + IO_BITMAP_BYTES + 7);
|
||||
}
|
||||
|
||||
static inline void set_ldt_desc(unsigned cpu, void *addr, int size)
|
||||
|
|
@ -1,340 +0,0 @@
|
|||
## DP: Upstream status: submitted
|
||||
diff -aurN a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
|
||||
--- a/drivers/ide/pci/alim15x3.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/alim15x3.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -583,7 +583,7 @@
|
||||
* appropriate also sets up the 1533 southbridge.
|
||||
*/
|
||||
|
||||
-static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char *name)
|
||||
+static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const char *name)
|
||||
{
|
||||
unsigned long flags;
|
||||
u8 tmpbyte;
|
||||
@@ -677,7 +677,7 @@
|
||||
* FIXME: frobs bits that are not defined on newer ALi devicea
|
||||
*/
|
||||
|
||||
-static unsigned int __init ata66_ali15x3 (ide_hwif_t *hwif)
|
||||
+static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
|
||||
{
|
||||
struct pci_dev *dev = hwif->pci_dev;
|
||||
unsigned int ata66 = 0;
|
||||
@@ -748,7 +748,7 @@
|
||||
* Initialize the IDE structure side of the ALi 15x3 driver.
|
||||
*/
|
||||
|
||||
-static void __init init_hwif_common_ali15x3 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
|
||||
{
|
||||
hwif->autodma = 0;
|
||||
hwif->tuneproc = &ali15x3_tune_drive;
|
||||
@@ -794,7 +794,7 @@
|
||||
* Sparc systems
|
||||
*/
|
||||
|
||||
-static void __init init_hwif_ali15x3 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
|
||||
{
|
||||
u8 ideic, inmir;
|
||||
s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6,
|
||||
@@ -847,7 +847,7 @@
|
||||
* the actual work.
|
||||
*/
|
||||
|
||||
-static void __init init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
|
||||
+static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
|
||||
{
|
||||
if (m5229_revision < 0x20)
|
||||
return;
|
||||
diff -aurN a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
|
||||
--- a/drivers/ide/pci/amd74xx.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/amd74xx.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -309,7 +309,7 @@
|
||||
* and initialize its drive independent registers.
|
||||
*/
|
||||
|
||||
-static unsigned int __init init_chipset_amd74xx(struct pci_dev *dev, const char *name)
|
||||
+static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const char *name)
|
||||
{
|
||||
unsigned char t;
|
||||
unsigned int u;
|
||||
@@ -413,7 +413,7 @@
|
||||
return dev->irq;
|
||||
}
|
||||
|
||||
-static void __init init_hwif_amd74xx(ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
|
||||
{
|
||||
int i;
|
||||
|
||||
diff -aurN a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
|
||||
--- a/drivers/ide/pci/cmd640.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/cmd640.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -278,7 +278,7 @@
|
||||
spin_unlock_irqrestore(&ide_lock, flags);
|
||||
}
|
||||
|
||||
-static int __init match_pci_cmd640_device (void)
|
||||
+static int __devinit match_pci_cmd640_device (void)
|
||||
{
|
||||
const u8 ven_dev[4] = {0x95, 0x10, 0x40, 0x06};
|
||||
unsigned int i;
|
||||
@@ -298,7 +298,7 @@
|
||||
/*
|
||||
* Probe for CMD640x -- pci method 1
|
||||
*/
|
||||
-static int __init probe_for_cmd640_pci1 (void)
|
||||
+static int __devinit probe_for_cmd640_pci1 (void)
|
||||
{
|
||||
__get_cmd640_reg = get_cmd640_reg_pci1;
|
||||
__put_cmd640_reg = put_cmd640_reg_pci1;
|
||||
@@ -314,7 +314,7 @@
|
||||
/*
|
||||
* Probe for CMD640x -- pci method 2
|
||||
*/
|
||||
-static int __init probe_for_cmd640_pci2 (void)
|
||||
+static int __devinit probe_for_cmd640_pci2 (void)
|
||||
{
|
||||
__get_cmd640_reg = get_cmd640_reg_pci2;
|
||||
__put_cmd640_reg = put_cmd640_reg_pci2;
|
||||
@@ -328,7 +328,7 @@
|
||||
/*
|
||||
* Probe for CMD640x -- vlb
|
||||
*/
|
||||
-static int __init probe_for_cmd640_vlb (void)
|
||||
+static int __devinit probe_for_cmd640_vlb (void)
|
||||
{
|
||||
u8 b;
|
||||
|
||||
@@ -349,7 +349,7 @@
|
||||
* Returns 1 if an IDE interface/drive exists at 0x170,
|
||||
* Returns 0 otherwise.
|
||||
*/
|
||||
-static int __init secondary_port_responding (void)
|
||||
+static int __devinit secondary_port_responding (void)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -392,7 +392,7 @@
|
||||
* Check whether prefetch is on for a drive,
|
||||
* and initialize the unmask flags for safe operation.
|
||||
*/
|
||||
-static void __init check_prefetch (unsigned int index)
|
||||
+static void __devinit check_prefetch (unsigned int index)
|
||||
{
|
||||
ide_drive_t *drive = cmd_drives[index];
|
||||
u8 b = get_cmd640_reg(prefetch_regs[index]);
|
||||
@@ -413,7 +413,7 @@
|
||||
/*
|
||||
* Figure out which devices we control
|
||||
*/
|
||||
-static void __init setup_device_ptrs (void)
|
||||
+static void __devinit setup_device_ptrs (void)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
@@ -495,7 +495,7 @@
|
||||
/*
|
||||
* This routine retrieves the initial drive timings from the chipset.
|
||||
*/
|
||||
-static void __init retrieve_drive_counts (unsigned int index)
|
||||
+static void __devinit retrieve_drive_counts (unsigned int index)
|
||||
{
|
||||
u8 b;
|
||||
|
||||
@@ -716,7 +716,7 @@
|
||||
/*
|
||||
* Probe for a cmd640 chipset, and initialize it if found. Called from ide.c
|
||||
*/
|
||||
-int __init ide_probe_for_cmd640x (void)
|
||||
+int __devinit ide_probe_for_cmd640x (void)
|
||||
{
|
||||
#ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
|
||||
int second_port_toggled = 0;
|
||||
diff -aurN a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
|
||||
--- a/drivers/ide/pci/cs5530.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/cs5530.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -217,7 +217,7 @@
|
||||
* Initialize the cs5530 bridge for reliable IDE DMA operation.
|
||||
*/
|
||||
|
||||
-static unsigned int __init init_chipset_cs5530 (struct pci_dev *dev, const char *name)
|
||||
+static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)
|
||||
{
|
||||
struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
|
||||
unsigned long flags;
|
||||
@@ -308,7 +308,7 @@
|
||||
* performs channel-specific pre-initialization before drive probing.
|
||||
*/
|
||||
|
||||
-static void __init init_hwif_cs5530 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
|
||||
{
|
||||
unsigned long basereg;
|
||||
u32 d0_timings;
|
||||
diff -aurN a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
|
||||
--- a/drivers/ide/pci/cy82c693.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/cy82c693.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -391,7 +391,7 @@
|
||||
/*
|
||||
* this function is called during init and is used to setup the cy82c693 chip
|
||||
*/
|
||||
-static unsigned int __init init_chipset_cy82c693(struct pci_dev *dev, const char *name)
|
||||
+static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const char *name)
|
||||
{
|
||||
if (PCI_FUNC(dev->devfn) != 1)
|
||||
return 0;
|
||||
@@ -443,7 +443,7 @@
|
||||
/*
|
||||
* the init function - called for each ide channel once
|
||||
*/
|
||||
-static void __init init_hwif_cy82c693(ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
|
||||
{
|
||||
hwif->autodma = 0;
|
||||
|
||||
@@ -467,9 +467,9 @@
|
||||
hwif->drives[1].autodma = hwif->autodma;
|
||||
}
|
||||
|
||||
-static __initdata ide_hwif_t *primary;
|
||||
+static __devinitdata ide_hwif_t *primary;
|
||||
|
||||
-void __init init_iops_cy82c693(ide_hwif_t *hwif)
|
||||
+void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
|
||||
{
|
||||
if (PCI_FUNC(hwif->pci_dev->devfn) == 1)
|
||||
primary = hwif;
|
||||
diff -aurN a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c
|
||||
--- a/drivers/ide/pci/it8172.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/it8172.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -216,7 +216,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static unsigned int __init init_chipset_it8172 (struct pci_dev *dev, const char *name)
|
||||
+static unsigned int __devinit init_chipset_it8172 (struct pci_dev *dev, const char *name)
|
||||
{
|
||||
unsigned char progif;
|
||||
|
||||
@@ -230,7 +230,7 @@
|
||||
}
|
||||
|
||||
|
||||
-static void __init init_hwif_it8172 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_it8172 (ide_hwif_t *hwif)
|
||||
{
|
||||
struct pci_dev* dev = hwif->pci_dev;
|
||||
unsigned long cmdBase, ctrlBase;
|
||||
diff -aurN a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
|
||||
--- a/drivers/ide/pci/ns87415.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/ns87415.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -195,7 +195,7 @@
|
||||
return __ide_dma_check(drive);
|
||||
}
|
||||
|
||||
-static void __init init_hwif_ns87415 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
|
||||
{
|
||||
struct pci_dev *dev = hwif->pci_dev;
|
||||
unsigned int ctrl, using_inta;
|
||||
diff -aurN a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
|
||||
--- a/drivers/ide/pci/opti621.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/opti621.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -326,7 +326,7 @@
|
||||
/*
|
||||
* init_hwif_opti621() is called once for each hwif found at boot.
|
||||
*/
|
||||
-static void __init init_hwif_opti621 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
|
||||
{
|
||||
hwif->autodma = 0;
|
||||
hwif->drives[0].drive_data = PIO_DONT_KNOW;
|
||||
diff -aurN a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
|
||||
--- a/drivers/ide/pci/sc1200.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/sc1200.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -459,7 +459,7 @@
|
||||
* This gets invoked by the IDE driver once for each channel,
|
||||
* and performs channel-specific pre-initialization before drive probing.
|
||||
*/
|
||||
-static void __init init_hwif_sc1200 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
|
||||
{
|
||||
if (hwif->mate)
|
||||
hwif->serialized = hwif->mate->serialized = 1;
|
||||
diff -aurN a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
|
||||
--- a/drivers/ide/pci/sl82c105.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/sl82c105.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -386,7 +386,7 @@
|
||||
* channel 0 here at least, but channel 1 has to be enabled by
|
||||
* firmware or arch code. We still set both to 16 bits mode.
|
||||
*/
|
||||
-static unsigned int __init init_chipset_sl82c105(struct pci_dev *dev, const char *msg)
|
||||
+static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev, const char *msg)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
@@ -399,7 +399,7 @@
|
||||
return dev->irq;
|
||||
}
|
||||
|
||||
-static void __init init_dma_sl82c105(ide_hwif_t *hwif, unsigned long dma_base)
|
||||
+static void __devinit init_dma_sl82c105(ide_hwif_t *hwif, unsigned long dma_base)
|
||||
{
|
||||
unsigned int rev;
|
||||
u8 dma_state;
|
||||
@@ -431,7 +431,7 @@
|
||||
* Initialise the chip
|
||||
*/
|
||||
|
||||
-static void __init init_hwif_sl82c105(ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
|
||||
{
|
||||
struct pci_dev *dev = hwif->pci_dev;
|
||||
u32 val;
|
||||
diff -aurN a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
|
||||
--- a/drivers/ide/pci/slc90e66.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/slc90e66.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -196,7 +196,7 @@
|
||||
}
|
||||
#endif /* CONFIG_BLK_DEV_IDEDMA */
|
||||
|
||||
-static void __init init_hwif_slc90e66 (ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
|
||||
{
|
||||
u8 reg47 = 0;
|
||||
u8 mask = hwif->channel ? 0x01 : 0x02; /* bit0:Primary */
|
||||
diff -aurN a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
|
||||
--- a/drivers/ide/pci/triflex.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/triflex.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -130,7 +130,7 @@
|
||||
return hwif->ide_dma_off_quietly(drive);
|
||||
}
|
||||
|
||||
-static void __init init_hwif_triflex(ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
|
||||
{
|
||||
hwif->tuneproc = &triflex_tune_drive;
|
||||
hwif->speedproc = &triflex_tune_chipset;
|
||||
diff -aurN a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
|
||||
--- a/drivers/ide/pci/via82cxxx.c 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/pci/via82cxxx.c 2005-06-15 22:01:23.000000000 -0400
|
||||
@@ -415,7 +415,7 @@
|
||||
* and initialize its drive independent registers.
|
||||
*/
|
||||
|
||||
-static unsigned int __init init_chipset_via82cxxx(struct pci_dev *dev, const char *name)
|
||||
+static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const char *name)
|
||||
{
|
||||
struct pci_dev *isa = NULL;
|
||||
u8 t, v;
|
||||
@@ -576,7 +576,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static void __init init_hwif_via82cxxx(ide_hwif_t *hwif)
|
||||
+static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ diff -urNad linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c /usr/src/dpatc
|
|||
{
|
||||
struct Scsi_Host *host;
|
||||
adapter_t *adapter;
|
||||
@@ -5033,37 +5033,25 @@
|
||||
@@ -5033,35 +5033,23 @@
|
||||
}
|
||||
|
||||
static struct pci_device_id megaraid_pci_tbl[] = {
|
||||
|
|
@ -79,9 +79,7 @@ diff -urNad linux-source-2.6.12-2.6.11.90/drivers/scsi/megaraid.c /usr/src/dpatc
|
|||
- .probe = megaraid_probe_one,
|
||||
+ .probe = megaraid_legacy_probe_one,
|
||||
.remove = __devexit_p(megaraid_remove_one),
|
||||
.driver = {
|
||||
.shutdown = megaraid_shutdown,
|
||||
},
|
||||
.shutdown = megaraid_shutdown,
|
||||
};
|
||||
|
||||
-static int __init megaraid_init(void)
|
||||
|
|
|
|||
|
|
@ -1,306 +0,0 @@
|
|||
#! /bin/sh -e
|
||||
## DP: Description: Fix ia64 generic UP builds
|
||||
## DP: Patch author: Jesse Barnes <jbarnes@engr.sgi.com>, dann frazier <dannf@debian.org>
|
||||
## DP: Upstream status: Submitted
|
||||
|
||||
. $(dirname $0)/DPATCH
|
||||
|
||||
@DPATCH@
|
||||
|
||||
diff -urN linux-2.6.12.orig/arch/ia64/kernel/Makefile linux-2.6.12/arch/ia64/kernel/Makefile
|
||||
--- linux-2.6.12.orig/arch/ia64/kernel/Makefile 2005-06-17 13:48:29.000000000 -0600
|
||||
+++ linux-2.6.12/arch/ia64/kernel/Makefile 2005-06-18 22:14:35.000000000 -0600
|
||||
@@ -17,6 +17,7 @@
|
||||
obj-$(CONFIG_IOSAPIC) += iosapic.o
|
||||
obj-$(CONFIG_MODULES) += module.o
|
||||
obj-$(CONFIG_SMP) += smp.o smpboot.o domain.o
|
||||
+obj-$(CONFIG_NUMA) += numa.o
|
||||
obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o
|
||||
obj-$(CONFIG_IA64_CYCLONE) += cyclone.o
|
||||
obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
|
||||
diff -urN linux-2.6.12.orig/arch/ia64/kernel/acpi.c linux-2.6.12/arch/ia64/kernel/acpi.c
|
||||
--- linux-2.6.12.orig/arch/ia64/kernel/acpi.c 2005-06-17 13:48:29.000000000 -0600
|
||||
+++ linux-2.6.12/arch/ia64/kernel/acpi.c 2005-06-18 22:14:35.000000000 -0600
|
||||
@@ -642,9 +642,11 @@
|
||||
if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
|
||||
node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
|
||||
}
|
||||
- build_cpu_to_node_map();
|
||||
# endif
|
||||
#endif
|
||||
+#ifdef CONFIG_ACPI_NUMA
|
||||
+ build_cpu_to_node_map();
|
||||
+#endif
|
||||
/* Make boot-up look pretty */
|
||||
printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
|
||||
return 0;
|
||||
diff -urN linux-2.6.12.orig/arch/ia64/kernel/numa.c linux-2.6.12/arch/ia64/kernel/numa.c
|
||||
--- linux-2.6.12.orig/arch/ia64/kernel/numa.c 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ linux-2.6.12/arch/ia64/kernel/numa.c 2005-06-18 22:14:35.000000000 -0600
|
||||
@@ -0,0 +1,57 @@
|
||||
+/*
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ *
|
||||
+ * ia64 kernel NUMA specific stuff
|
||||
+ *
|
||||
+ * Copyright (C) 2002 Erich Focht <efocht@ess.nec.de>
|
||||
+ * Copyright (C) 2004 Silicon Graphics, Inc.
|
||||
+ * Jesse Barnes <jbarnes@sgi.com>
|
||||
+ */
|
||||
+#include <linux/config.h>
|
||||
+#include <linux/topology.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <asm/processor.h>
|
||||
+#include <asm/smp.h>
|
||||
+
|
||||
+u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
|
||||
+EXPORT_SYMBOL(cpu_to_node_map);
|
||||
+
|
||||
+cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
|
||||
+
|
||||
+/**
|
||||
+ * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
|
||||
+ *
|
||||
+ * Build cpu to node mapping and initialize the per node cpu masks using
|
||||
+ * info from the node_cpuid array handed to us by ACPI.
|
||||
+ */
|
||||
+void __init build_cpu_to_node_map(void)
|
||||
+{
|
||||
+ int cpu, i, node;
|
||||
+
|
||||
+ for(node=0; node < MAX_NUMNODES; node++)
|
||||
+ cpus_clear(node_to_cpu_mask[node]);
|
||||
+
|
||||
+ for(cpu = 0; cpu < NR_CPUS; ++cpu) {
|
||||
+ node = -1;
|
||||
+ for (i = 0; i < NR_CPUS; ++i)
|
||||
+ if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
|
||||
+ node = node_cpuid[i].nid;
|
||||
+ break;
|
||||
+ }
|
||||
+ cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
|
||||
+ if (node >= 0)
|
||||
+ cpu_set(cpu, node_to_cpu_mask[node]);
|
||||
+ }
|
||||
+}
|
||||
diff -urN linux-2.6.12.orig/arch/ia64/kernel/smpboot.c linux-2.6.12/arch/ia64/kernel/smpboot.c
|
||||
--- linux-2.6.12.orig/arch/ia64/kernel/smpboot.c 2005-06-17 13:48:29.000000000 -0600
|
||||
+++ linux-2.6.12/arch/ia64/kernel/smpboot.c 2005-06-18 22:14:35.000000000 -0600
|
||||
@@ -524,47 +524,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-#ifdef CONFIG_NUMA
|
||||
-
|
||||
-/* on which node is each logical CPU (one cacheline even for 64 CPUs) */
|
||||
-u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
|
||||
-EXPORT_SYMBOL(cpu_to_node_map);
|
||||
-/* which logical CPUs are on which nodes */
|
||||
-cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
|
||||
-
|
||||
-/*
|
||||
- * Build cpu to node mapping and initialize the per node cpu masks.
|
||||
- */
|
||||
-void __init
|
||||
-build_cpu_to_node_map (void)
|
||||
-{
|
||||
- int cpu, i, node;
|
||||
-
|
||||
- for(node=0; node<MAX_NUMNODES; node++)
|
||||
- cpus_clear(node_to_cpu_mask[node]);
|
||||
- for(cpu = 0; cpu < NR_CPUS; ++cpu) {
|
||||
- /*
|
||||
- * All Itanium NUMA platforms I know use ACPI, so maybe we
|
||||
- * can drop this ifdef completely. [EF]
|
||||
- */
|
||||
-#ifdef CONFIG_ACPI_NUMA
|
||||
- node = -1;
|
||||
- for (i = 0; i < NR_CPUS; ++i)
|
||||
- if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
|
||||
- node = node_cpuid[i].nid;
|
||||
- break;
|
||||
- }
|
||||
-#else
|
||||
-# error Fixme: Dunno how to build CPU-to-node map.
|
||||
-#endif
|
||||
- cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
|
||||
- if (node >= 0)
|
||||
- cpu_set(cpu, node_to_cpu_mask[node]);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-#endif /* CONFIG_NUMA */
|
||||
-
|
||||
/*
|
||||
* Cycle through the APs sending Wakeup IPIs to boot each.
|
||||
*/
|
||||
diff -urN linux-2.6.12.orig/arch/ia64/mm/discontig.c linux-2.6.12/arch/ia64/mm/discontig.c
|
||||
--- linux-2.6.12.orig/arch/ia64/mm/discontig.c 2005-06-17 13:48:29.000000000 -0600
|
||||
+++ linux-2.6.12/arch/ia64/mm/discontig.c 2005-06-18 22:14:35.000000000 -0600
|
||||
@@ -274,6 +274,33 @@
|
||||
}
|
||||
|
||||
/**
|
||||
+ * per_cpu_node_setup - setup per-cpu areas on each node
|
||||
+ * @cpu_data: per-cpu area on this node
|
||||
+ * @node: node to setup
|
||||
+ *
|
||||
+ * Copy the static per-cpu data into the region we just set aside and then
|
||||
+ * setup __per_cpu_offset for each CPU on this node. Return a pointer to
|
||||
+ * the end of the area.
|
||||
+ */
|
||||
+static void *per_cpu_node_setup(void *cpu_data, int node)
|
||||
+{
|
||||
+#ifdef CONFIG_SMP
|
||||
+ int cpu;
|
||||
+
|
||||
+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
|
||||
+ if (node == node_cpuid[cpu].nid) {
|
||||
+ memcpy(__va(cpu_data), __phys_per_cpu_start,
|
||||
+ __per_cpu_end - __per_cpu_start);
|
||||
+ __per_cpu_offset[cpu] = (char*)__va(cpu_data) -
|
||||
+ __per_cpu_start;
|
||||
+ cpu_data += PERCPU_PAGE_SIZE;
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+ return cpu_data;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
* find_pernode_space - allocate memory for memory map and per-node structures
|
||||
* @start: physical start of range
|
||||
* @len: length of range
|
||||
@@ -304,7 +331,7 @@
|
||||
static int __init find_pernode_space(unsigned long start, unsigned long len,
|
||||
int node)
|
||||
{
|
||||
- unsigned long epfn, cpu, cpus, phys_cpus;
|
||||
+ unsigned long epfn, cpus, phys_cpus;
|
||||
unsigned long pernodesize = 0, pernode, pages, mapsize;
|
||||
void *cpu_data;
|
||||
struct bootmem_data *bdp = &mem_data[node].bootmem_data;
|
||||
@@ -357,20 +384,7 @@
|
||||
mem_data[node].pgdat->bdata = bdp;
|
||||
pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));
|
||||
|
||||
- /*
|
||||
- * Copy the static per-cpu data into the region we
|
||||
- * just set aside and then setup __per_cpu_offset
|
||||
- * for each CPU on this node.
|
||||
- */
|
||||
- for (cpu = 0; cpu < NR_CPUS; cpu++) {
|
||||
- if (node == node_cpuid[cpu].nid) {
|
||||
- memcpy(__va(cpu_data), __phys_per_cpu_start,
|
||||
- __per_cpu_end - __per_cpu_start);
|
||||
- __per_cpu_offset[cpu] = (char*)__va(cpu_data) -
|
||||
- __per_cpu_start;
|
||||
- cpu_data += PERCPU_PAGE_SIZE;
|
||||
- }
|
||||
- }
|
||||
+ cpu_data = per_cpu_node_setup(cpu_data, node);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -436,8 +450,8 @@
|
||||
*/
|
||||
static void __init initialize_pernode_data(void)
|
||||
{
|
||||
- int cpu, node;
|
||||
pg_data_t *pgdat_list[MAX_NUMNODES];
|
||||
+ int cpu, node;
|
||||
|
||||
for_each_online_node(node)
|
||||
pgdat_list[node] = mem_data[node].pgdat;
|
||||
@@ -447,12 +461,22 @@
|
||||
memcpy(mem_data[node].node_data->pg_data_ptrs, pgdat_list,
|
||||
sizeof(pgdat_list));
|
||||
}
|
||||
-
|
||||
+#ifdef CONFIG_SMP
|
||||
/* Set the node_data pointer for each per-cpu struct */
|
||||
for (cpu = 0; cpu < NR_CPUS; cpu++) {
|
||||
node = node_cpuid[cpu].nid;
|
||||
per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data;
|
||||
}
|
||||
+#else
|
||||
+ {
|
||||
+ struct cpuinfo_ia64 *cpu0_cpu_info;
|
||||
+ cpu = 0;
|
||||
+ node = node_cpuid[cpu].nid;
|
||||
+ cpu0_cpu_info = (struct cpuinfo_ia64 *)(__phys_per_cpu_start +
|
||||
+ ((char *)&per_cpu__cpu_info - __per_cpu_start));
|
||||
+ cpu0_cpu_info->node_data = mem_data[node].node_data;
|
||||
+ }
|
||||
+#endif /* CONFIG_SMP */
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -519,6 +543,7 @@
|
||||
find_initrd();
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_SMP
|
||||
/**
|
||||
* per_cpu_init - setup per-cpu variables
|
||||
*
|
||||
@@ -529,15 +554,15 @@
|
||||
{
|
||||
int cpu;
|
||||
|
||||
- if (smp_processor_id() == 0) {
|
||||
- for (cpu = 0; cpu < NR_CPUS; cpu++) {
|
||||
- per_cpu(local_per_cpu_offset, cpu) =
|
||||
- __per_cpu_offset[cpu];
|
||||
- }
|
||||
- }
|
||||
+ if (smp_processor_id() != 0)
|
||||
+ return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
|
||||
+
|
||||
+ for (cpu = 0; cpu < NR_CPUS; cpu++)
|
||||
+ per_cpu(local_per_cpu_offset, cpu) = __per_cpu_offset[cpu];
|
||||
|
||||
return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
|
||||
}
|
||||
+#endif /* CONFIG_SMP */
|
||||
|
||||
/**
|
||||
* show_mem - give short summary of memory stats
|
||||
diff -urN linux-2.6.12.orig/include/asm-ia64/sn/arch.h linux-2.6.12/include/asm-ia64/sn/arch.h
|
||||
--- linux-2.6.12.orig/include/asm-ia64/sn/arch.h 2005-06-17 13:48:29.000000000 -0600
|
||||
+++ linux-2.6.12/include/asm-ia64/sn/arch.h 2005-06-18 22:15:39.000000000 -0600
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef _ASM_IA64_SN_ARCH_H
|
||||
#define _ASM_IA64_SN_ARCH_H
|
||||
|
||||
+#include <linux/numa.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/percpu.h>
|
||||
#include <asm/sn/types.h>
|
||||
diff -urN linux-2.6.12.orig/include/asm-ia64/sn/sn_cpuid.h linux-2.6.12/include/asm-ia64/sn/sn_cpuid.h
|
||||
--- linux-2.6.12.orig/include/asm-ia64/sn/sn_cpuid.h 2005-06-17 13:48:29.000000000 -0600
|
||||
+++ linux-2.6.12/include/asm-ia64/sn/sn_cpuid.h 2005-06-18 22:14:35.000000000 -0600
|
||||
@@ -81,11 +81,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#ifndef CONFIG_SMP
|
||||
-#define cpu_physical_id(cpuid) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
|
||||
-#endif
|
||||
-
|
||||
-
|
||||
#define get_node_number(addr) NASID_GET(addr)
|
||||
|
||||
/*
|
||||
|
|
@ -18,9 +18,8 @@ diff -aurN a/drivers/ide/Kconfig b/drivers/ide/Kconfig
|
|||
diff -aurN a/drivers/ide/Makefile b/drivers/ide/Makefile
|
||||
--- a/drivers/ide/Makefile 2005-06-06 11:22:29.000000000 -0400
|
||||
+++ b/drivers/ide/Makefile 2005-06-15 22:15:06.000000000 -0400
|
||||
@@ -22,7 +22,6 @@
|
||||
@@ -23,6 +23,5 @@
|
||||
ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o
|
||||
ide-core-$(CONFIG_BLK_DEV_IDE_TCQ) += ide-tcq.o
|
||||
ide-core-$(CONFIG_PROC_FS) += ide-proc.o
|
||||
-ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o
|
||||
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
|
||||
--- a/arch/ia64/kernel/ptrace.c
|
||||
+++ b/arch/ia64/kernel/ptrace.c
|
||||
@@ -945,6 +945,13 @@ access_uarea (struct task_struct *child,
|
||||
*data = (pt->cr_ipsr & IPSR_MASK);
|
||||
return 0;
|
||||
|
||||
+ case PT_AR_RSC:
|
||||
+ if (write_access)
|
||||
+ pt->ar_rsc = *data | (3 << 2); /* force PL3 */
|
||||
+ else
|
||||
+ *data = pt->ar_rsc;
|
||||
+ return 0;
|
||||
+
|
||||
case PT_AR_RNAT:
|
||||
urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
|
||||
rnat_addr = (long) ia64_rse_rnat_addr((long *)
|
||||
@@ -996,9 +1003,6 @@ access_uarea (struct task_struct *child,
|
||||
case PT_AR_BSPSTORE:
|
||||
ptr = pt_reg_addr(pt, ar_bspstore);
|
||||
break;
|
||||
- case PT_AR_RSC:
|
||||
- ptr = pt_reg_addr(pt, ar_rsc);
|
||||
- break;
|
||||
case PT_AR_UNAT:
|
||||
ptr = pt_reg_addr(pt, ar_unat);
|
||||
break;
|
||||
@@ -1234,7 +1238,7 @@ ptrace_getregs (struct task_struct *chil
|
||||
static long
|
||||
ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
|
||||
{
|
||||
- unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
|
||||
+ unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
|
||||
struct unw_frame_info info;
|
||||
struct switch_stack *sw;
|
||||
struct ia64_fpreg fpval;
|
||||
@@ -1267,7 +1271,7 @@ ptrace_setregs (struct task_struct *chil
|
||||
/* app regs */
|
||||
|
||||
retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
|
||||
- retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);
|
||||
+ retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
|
||||
retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
|
||||
retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
|
||||
retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
|
||||
@@ -1365,6 +1369,7 @@ ptrace_setregs (struct task_struct *chil
|
||||
retval |= __get_user(nat_bits, &ppr->nat);
|
||||
|
||||
retval |= access_uarea(child, PT_CR_IPSR, &psr, 1);
|
||||
+ retval |= access_uarea(child, PT_AR_RSC, &rsc, 1);
|
||||
retval |= access_uarea(child, PT_AR_EC, &ec, 1);
|
||||
retval |= access_uarea(child, PT_AR_LC, &lc, 1);
|
||||
retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);
|
||||
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
|
||||
--- a/arch/ia64/kernel/signal.c
|
||||
+++ b/arch/ia64/kernel/signal.c
|
||||
@@ -94,7 +94,7 @@ sys_sigaltstack (const stack_t __user *u
|
||||
static long
|
||||
restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
|
||||
{
|
||||
- unsigned long ip, flags, nat, um, cfm;
|
||||
+ unsigned long ip, flags, nat, um, cfm, rsc;
|
||||
long err;
|
||||
|
||||
/* Always make any pending restarted system calls return -EINTR */
|
||||
@@ -106,7 +106,7 @@ restore_sigcontext (struct sigcontext __
|
||||
err |= __get_user(ip, &sc->sc_ip); /* instruction pointer */
|
||||
err |= __get_user(cfm, &sc->sc_cfm);
|
||||
err |= __get_user(um, &sc->sc_um); /* user mask */
|
||||
- err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
|
||||
+ err |= __get_user(rsc, &sc->sc_ar_rsc);
|
||||
err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
|
||||
err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
|
||||
err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
|
||||
@@ -119,6 +119,7 @@ restore_sigcontext (struct sigcontext __
|
||||
err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8); /* r15 */
|
||||
|
||||
scr->pt.cr_ifs = cfm | (1UL << 63);
|
||||
+ scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
|
||||
|
||||
/* establish new instruction pointer: */
|
||||
scr->pt.cr_iip = ip & ~0x3UL;
|
||||
diff --git a/fs/exec.c b/fs/exec.c
|
||||
--- a/fs/exec.c
|
||||
+++ b/fs/exec.c
|
||||
@@ -649,6 +649,7 @@ static inline int de_thread(struct task_
|
||||
}
|
||||
sig->group_exit_task = NULL;
|
||||
sig->notify_count = 0;
|
||||
+ sig->real_timer.data = (unsigned long)current;
|
||||
spin_unlock_irq(lock);
|
||||
|
||||
/*
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
|
||||
--- a/drivers/acpi/pci_irq.c
|
||||
+++ b/drivers/acpi/pci_irq.c
|
||||
@@ -435,6 +435,7 @@ acpi_pci_irq_enable (
|
||||
/* Interrupt Line values above 0xF are forbidden */
|
||||
if (dev->irq >= 0 && (dev->irq <= 0xF)) {
|
||||
printk(" - using IRQ %d\n", dev->irq);
|
||||
+ acpi_register_gsi(dev->irq, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
|
||||
return_VALUE(0);
|
||||
}
|
||||
else {
|
||||
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
|
||||
--- a/drivers/net/e1000/e1000_main.c
|
||||
+++ b/drivers/net/e1000/e1000_main.c
|
||||
@@ -2307,6 +2307,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
|
||||
tso = e1000_tso(adapter, skb);
|
||||
if (tso < 0) {
|
||||
dev_kfree_skb_any(skb);
|
||||
+ spin_unlock_irqrestore(&adapter->tx_lock, flags);
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
|
||||
--- a/drivers/pci/pci-driver.c
|
||||
+++ b/drivers/pci/pci-driver.c
|
||||
@@ -396,7 +396,7 @@ int pci_register_driver(struct pci_drive
|
||||
/* FIXME, once all of the existing PCI drivers have been fixed to set
|
||||
* the pci shutdown function, this test can go away. */
|
||||
if (!drv->driver.shutdown)
|
||||
- drv->driver.shutdown = pci_device_shutdown,
|
||||
+ drv->driver.shutdown = pci_device_shutdown;
|
||||
drv->driver.owner = drv->owner;
|
||||
drv->driver.kobj.ktype = &pci_driver_kobj_type;
|
||||
pci_init_dynids(&drv->dynids);
|
||||
diff --git a/include/asm-i386/string.h b/include/asm-i386/string.h
|
||||
--- a/include/asm-i386/string.h
|
||||
+++ b/include/asm-i386/string.h
|
||||
@@ -116,7 +116,8 @@ __asm__ __volatile__(
|
||||
"orb $1,%%al\n"
|
||||
"3:"
|
||||
:"=a" (__res), "=&S" (d0), "=&D" (d1)
|
||||
- :"1" (cs),"2" (ct));
|
||||
+ :"1" (cs),"2" (ct)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
|
||||
@@ -138,8 +139,9 @@ __asm__ __volatile__(
|
||||
"3:\tsbbl %%eax,%%eax\n\t"
|
||||
"orb $1,%%al\n"
|
||||
"4:"
|
||||
- :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2)
|
||||
- :"1" (cs),"2" (ct),"3" (count));
|
||||
+ :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2)
|
||||
+ :"1" (cs),"2" (ct),"3" (count)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
|
||||
@@ -158,7 +160,9 @@ __asm__ __volatile__(
|
||||
"movl $1,%1\n"
|
||||
"2:\tmovl %1,%0\n\t"
|
||||
"decl %0"
|
||||
- :"=a" (__res), "=&S" (d0) : "1" (s),"0" (c));
|
||||
+ :"=a" (__res), "=&S" (d0)
|
||||
+ :"1" (s),"0" (c)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
|
||||
@@ -175,7 +179,9 @@ __asm__ __volatile__(
|
||||
"leal -1(%%esi),%0\n"
|
||||
"2:\ttestb %%al,%%al\n\t"
|
||||
"jne 1b"
|
||||
- :"=g" (__res), "=&S" (d0), "=&a" (d1) :"0" (0),"1" (s),"2" (c));
|
||||
+ :"=g" (__res), "=&S" (d0), "=&a" (d1)
|
||||
+ :"0" (0),"1" (s),"2" (c)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
|
||||
@@ -189,7 +195,9 @@ __asm__ __volatile__(
|
||||
"scasb\n\t"
|
||||
"notl %0\n\t"
|
||||
"decl %0"
|
||||
- :"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffffu));
|
||||
+ :"=c" (__res), "=&D" (d0)
|
||||
+ :"1" (s),"a" (0), "0" (0xffffffffu)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
|
||||
@@ -333,7 +341,9 @@ __asm__ __volatile__(
|
||||
"je 1f\n\t"
|
||||
"movl $1,%0\n"
|
||||
"1:\tdecl %0"
|
||||
- :"=D" (__res), "=&c" (d0) : "a" (c),"0" (cs),"1" (count));
|
||||
+ :"=D" (__res), "=&c" (d0)
|
||||
+ :"a" (c),"0" (cs),"1" (count)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
|
||||
@@ -369,7 +379,7 @@ __asm__ __volatile__(
|
||||
"je 2f\n\t"
|
||||
"stosb\n"
|
||||
"2:"
|
||||
- : "=&c" (d0), "=&D" (d1)
|
||||
+ :"=&c" (d0), "=&D" (d1)
|
||||
:"a" (c), "q" (count), "0" (count/4), "1" ((long) s)
|
||||
:"memory");
|
||||
return (s);
|
||||
@@ -392,7 +402,8 @@ __asm__ __volatile__(
|
||||
"jne 1b\n"
|
||||
"3:\tsubl %2,%0"
|
||||
:"=a" (__res), "=&d" (d0)
|
||||
- :"c" (s),"1" (count));
|
||||
+ :"c" (s),"1" (count)
|
||||
+ :"memory");
|
||||
return __res;
|
||||
}
|
||||
/* end of additional stuff */
|
||||
@@ -473,7 +484,8 @@ static inline void * memscan(void * addr
|
||||
"dec %%edi\n"
|
||||
"1:"
|
||||
: "=D" (addr), "=c" (size)
|
||||
- : "0" (addr), "1" (size), "a" (c));
|
||||
+ : "0" (addr), "1" (size), "a" (c)
|
||||
+ : "memory");
|
||||
return addr;
|
||||
}
|
||||
|
||||
diff --git a/mm/memory.c b/mm/memory.c
|
||||
--- a/mm/memory.c
|
||||
+++ b/mm/memory.c
|
||||
@@ -1164,7 +1164,7 @@ int remap_pfn_range(struct vm_area_struc
|
||||
{
|
||||
pgd_t *pgd;
|
||||
unsigned long next;
|
||||
- unsigned long end = addr + size;
|
||||
+ unsigned long end = addr + PAGE_ALIGN(size);
|
||||
struct mm_struct *mm = vma->vm_mm;
|
||||
int err;
|
||||
|
||||
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
|
||||
--- a/net/netlink/af_netlink.c
|
||||
+++ b/net/netlink/af_netlink.c
|
||||
@@ -315,8 +315,8 @@ err:
|
||||
static void netlink_remove(struct sock *sk)
|
||||
{
|
||||
netlink_table_grab();
|
||||
- nl_table[sk->sk_protocol].hash.entries--;
|
||||
- sk_del_node_init(sk);
|
||||
+ if (sk_del_node_init(sk))
|
||||
+ nl_table[sk->sk_protocol].hash.entries--;
|
||||
if (nlk_sk(sk)->groups)
|
||||
__sk_del_bind_node(sk);
|
||||
netlink_table_ungrab();
|
||||
@@ -429,7 +429,12 @@ retry:
|
||||
err = netlink_insert(sk, pid);
|
||||
if (err == -EADDRINUSE)
|
||||
goto retry;
|
||||
- return 0;
|
||||
+
|
||||
+ /* If 2 threads race to autobind, that is fine. */
|
||||
+ if (err == -EBUSY)
|
||||
+ err = 0;
|
||||
+
|
||||
+ return err;
|
||||
}
|
||||
|
||||
static inline int netlink_capable(struct socket *sock, unsigned int flag)
|
||||
|
|
@ -1,640 +0,0 @@
|
|||
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
|
||||
--- a/arch/ppc/kernel/time.c
|
||||
+++ b/arch/ppc/kernel/time.c
|
||||
@@ -89,6 +89,9 @@ unsigned long tb_to_ns_scale;
|
||||
|
||||
extern unsigned long wall_jiffies;
|
||||
|
||||
+/* used for timezone offset */
|
||||
+static long timezone_offset;
|
||||
+
|
||||
DEFINE_SPINLOCK(rtc_lock);
|
||||
|
||||
EXPORT_SYMBOL(rtc_lock);
|
||||
@@ -170,7 +173,7 @@ void timer_interrupt(struct pt_regs * re
|
||||
xtime.tv_sec - last_rtc_update >= 659 &&
|
||||
abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ &&
|
||||
jiffies - wall_jiffies == 1) {
|
||||
- if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0)
|
||||
+ if (ppc_md.set_rtc_time(xtime.tv_sec+1 + timezone_offset) == 0)
|
||||
last_rtc_update = xtime.tv_sec+1;
|
||||
else
|
||||
/* Try again one minute later */
|
||||
@@ -286,7 +289,7 @@ void __init time_init(void)
|
||||
unsigned old_stamp, stamp, elapsed;
|
||||
|
||||
if (ppc_md.time_init != NULL)
|
||||
- time_offset = ppc_md.time_init();
|
||||
+ timezone_offset = ppc_md.time_init();
|
||||
|
||||
if (__USE_RTC()) {
|
||||
/* 601 processor: dec counts down by 128 every 128ns */
|
||||
@@ -331,10 +334,10 @@ void __init time_init(void)
|
||||
set_dec(tb_ticks_per_jiffy);
|
||||
|
||||
/* If platform provided a timezone (pmac), we correct the time */
|
||||
- if (time_offset) {
|
||||
- sys_tz.tz_minuteswest = -time_offset / 60;
|
||||
+ if (timezone_offset) {
|
||||
+ sys_tz.tz_minuteswest = -timezone_offset / 60;
|
||||
sys_tz.tz_dsttime = 0;
|
||||
- xtime.tv_sec -= time_offset;
|
||||
+ xtime.tv_sec -= timezone_offset;
|
||||
}
|
||||
set_normalized_timespec(&wall_to_monotonic,
|
||||
-xtime.tv_sec, -xtime.tv_nsec);
|
||||
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
|
||||
--- a/arch/um/kernel/process.c
|
||||
+++ b/arch/um/kernel/process.c
|
||||
@@ -130,7 +130,7 @@ int start_fork_tramp(void *thread_arg, u
|
||||
return(arg.pid);
|
||||
}
|
||||
|
||||
-static int ptrace_child(void)
|
||||
+static int ptrace_child(void *arg)
|
||||
{
|
||||
int ret;
|
||||
int pid = os_getpid(), ppid = getppid();
|
||||
@@ -159,16 +159,20 @@ static int ptrace_child(void)
|
||||
_exit(ret);
|
||||
}
|
||||
|
||||
-static int start_ptraced_child(void)
|
||||
+static int start_ptraced_child(void **stack_out)
|
||||
{
|
||||
+ void *stack;
|
||||
+ unsigned long sp;
|
||||
int pid, n, status;
|
||||
|
||||
- pid = fork();
|
||||
- if(pid == 0)
|
||||
- ptrace_child();
|
||||
-
|
||||
+ stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
|
||||
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
||||
+ if(stack == MAP_FAILED)
|
||||
+ panic("check_ptrace : mmap failed, errno = %d", errno);
|
||||
+ sp = (unsigned long) stack + PAGE_SIZE - sizeof(void *);
|
||||
+ pid = clone(ptrace_child, (void *) sp, SIGCHLD, NULL);
|
||||
if(pid < 0)
|
||||
- panic("check_ptrace : fork failed, errno = %d", errno);
|
||||
+ panic("check_ptrace : clone failed, errno = %d", errno);
|
||||
CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
|
||||
if(n < 0)
|
||||
panic("check_ptrace : wait failed, errno = %d", errno);
|
||||
@@ -176,6 +180,7 @@ static int start_ptraced_child(void)
|
||||
panic("check_ptrace : expected SIGSTOP, got status = %d",
|
||||
status);
|
||||
|
||||
+ *stack_out = stack;
|
||||
return(pid);
|
||||
}
|
||||
|
||||
@@ -183,12 +188,12 @@ static int start_ptraced_child(void)
|
||||
* just avoid using sysemu, not panic, but only if SYSEMU features are broken.
|
||||
* So only for SYSEMU features we test mustpanic, while normal host features
|
||||
* must work anyway!*/
|
||||
-static int stop_ptraced_child(int pid, int exitcode, int mustexit)
|
||||
+static int stop_ptraced_child(int pid, void *stack, int exitcode, int mustpanic)
|
||||
{
|
||||
int status, n, ret = 0;
|
||||
|
||||
if(ptrace(PTRACE_CONT, pid, 0, 0) < 0)
|
||||
- panic("stop_ptraced_child : ptrace failed, errno = %d", errno);
|
||||
+ panic("check_ptrace : ptrace failed, errno = %d", errno);
|
||||
CATCH_EINTR(n = waitpid(pid, &status, 0));
|
||||
if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {
|
||||
int exit_with = WEXITSTATUS(status);
|
||||
@@ -199,13 +204,15 @@ static int stop_ptraced_child(int pid, i
|
||||
printk("check_ptrace : child exited with exitcode %d, while "
|
||||
"expecting %d; status 0x%x", exit_with,
|
||||
exitcode, status);
|
||||
- if (mustexit)
|
||||
+ if (mustpanic)
|
||||
panic("\n");
|
||||
else
|
||||
printk("\n");
|
||||
ret = -1;
|
||||
}
|
||||
|
||||
+ if(munmap(stack, PAGE_SIZE) < 0)
|
||||
+ panic("check_ptrace : munmap failed, errno = %d", errno);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -227,11 +234,12 @@ __uml_setup("nosysemu", nosysemu_cmd_par
|
||||
|
||||
static void __init check_sysemu(void)
|
||||
{
|
||||
+ void *stack;
|
||||
int pid, syscall, n, status, count=0;
|
||||
|
||||
printk("Checking syscall emulation patch for ptrace...");
|
||||
sysemu_supported = 0;
|
||||
- pid = start_ptraced_child();
|
||||
+ pid = start_ptraced_child(&stack);
|
||||
|
||||
if(ptrace(PTRACE_SYSEMU, pid, 0, 0) < 0)
|
||||
goto fail;
|
||||
@@ -249,7 +257,7 @@ static void __init check_sysemu(void)
|
||||
panic("check_sysemu : failed to modify system "
|
||||
"call return, errno = %d", errno);
|
||||
|
||||
- if (stop_ptraced_child(pid, 0, 0) < 0)
|
||||
+ if (stop_ptraced_child(pid, stack, 0, 0) < 0)
|
||||
goto fail_stopped;
|
||||
|
||||
sysemu_supported = 1;
|
||||
@@ -257,7 +265,7 @@ static void __init check_sysemu(void)
|
||||
set_using_sysemu(!force_sysemu_disabled);
|
||||
|
||||
printk("Checking advanced syscall emulation patch for ptrace...");
|
||||
- pid = start_ptraced_child();
|
||||
+ pid = start_ptraced_child(&stack);
|
||||
while(1){
|
||||
count++;
|
||||
if(ptrace(PTRACE_SYSEMU_SINGLESTEP, pid, 0, 0) < 0)
|
||||
@@ -282,7 +290,7 @@ static void __init check_sysemu(void)
|
||||
break;
|
||||
}
|
||||
}
|
||||
- if (stop_ptraced_child(pid, 0, 0) < 0)
|
||||
+ if (stop_ptraced_child(pid, stack, 0, 0) < 0)
|
||||
goto fail_stopped;
|
||||
|
||||
sysemu_supported = 2;
|
||||
@@ -293,17 +301,18 @@ static void __init check_sysemu(void)
|
||||
return;
|
||||
|
||||
fail:
|
||||
- stop_ptraced_child(pid, 1, 0);
|
||||
+ stop_ptraced_child(pid, stack, 1, 0);
|
||||
fail_stopped:
|
||||
printk("missing\n");
|
||||
}
|
||||
|
||||
void __init check_ptrace(void)
|
||||
{
|
||||
+ void *stack;
|
||||
int pid, syscall, n, status;
|
||||
|
||||
printk("Checking that ptrace can change system call numbers...");
|
||||
- pid = start_ptraced_child();
|
||||
+ pid = start_ptraced_child(&stack);
|
||||
|
||||
if (ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
|
||||
panic("check_ptrace: PTRACE_SETOPTIONS failed, errno = %d", errno);
|
||||
@@ -330,7 +339,7 @@ void __init check_ptrace(void)
|
||||
break;
|
||||
}
|
||||
}
|
||||
- stop_ptraced_child(pid, 0, 1);
|
||||
+ stop_ptraced_child(pid, stack, 0, 1);
|
||||
printk("OK\n");
|
||||
check_sysemu();
|
||||
}
|
||||
@@ -362,10 +371,11 @@ void forward_pending_sigio(int target)
|
||||
static inline int check_skas3_ptrace_support(void)
|
||||
{
|
||||
struct ptrace_faultinfo fi;
|
||||
+ void *stack;
|
||||
int pid, n, ret = 1;
|
||||
|
||||
printf("Checking for the skas3 patch in the host...");
|
||||
- pid = start_ptraced_child();
|
||||
+ pid = start_ptraced_child(&stack);
|
||||
|
||||
n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
|
||||
if (n < 0) {
|
||||
@@ -380,7 +390,7 @@ static inline int check_skas3_ptrace_sup
|
||||
}
|
||||
|
||||
init_registers(pid);
|
||||
- stop_ptraced_child(pid, 1, 1);
|
||||
+ stop_ptraced_child(pid, stack, 1, 1);
|
||||
|
||||
return(ret);
|
||||
}
|
||||
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
|
||||
--- a/drivers/acpi/pci_irq.c
|
||||
+++ b/drivers/acpi/pci_irq.c
|
||||
@@ -433,7 +433,7 @@ acpi_pci_irq_enable (
|
||||
printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI",
|
||||
pci_name(dev), ('A' + pin));
|
||||
/* Interrupt Line values above 0xF are forbidden */
|
||||
- if (dev->irq >= 0 && (dev->irq <= 0xF)) {
|
||||
+ if (dev->irq > 0 && (dev->irq <= 0xF)) {
|
||||
printk(" - using IRQ %d\n", dev->irq);
|
||||
acpi_register_gsi(dev->irq, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
|
||||
return_VALUE(0);
|
||||
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
|
||||
--- a/drivers/char/tpm/tpm.c
|
||||
+++ b/drivers/char/tpm/tpm.c
|
||||
@@ -32,12 +32,6 @@
|
||||
|
||||
#define TPM_BUFSIZE 2048
|
||||
|
||||
-/* PCI configuration addresses */
|
||||
-#define PCI_GEN_PMCON_1 0xA0
|
||||
-#define PCI_GEN1_DEC 0xE4
|
||||
-#define PCI_LPC_EN 0xE6
|
||||
-#define PCI_GEN2_DEC 0xEC
|
||||
-
|
||||
static LIST_HEAD(tpm_chip_list);
|
||||
static DEFINE_SPINLOCK(driver_lock);
|
||||
static int dev_mask[32];
|
||||
@@ -61,72 +55,6 @@ void tpm_time_expired(unsigned long ptr)
|
||||
EXPORT_SYMBOL_GPL(tpm_time_expired);
|
||||
|
||||
/*
|
||||
- * Initialize the LPC bus and enable the TPM ports
|
||||
- */
|
||||
-int tpm_lpc_bus_init(struct pci_dev *pci_dev, u16 base)
|
||||
-{
|
||||
- u32 lpcenable, tmp;
|
||||
- int is_lpcm = 0;
|
||||
-
|
||||
- switch (pci_dev->vendor) {
|
||||
- case PCI_VENDOR_ID_INTEL:
|
||||
- switch (pci_dev->device) {
|
||||
- case PCI_DEVICE_ID_INTEL_82801CA_12:
|
||||
- case PCI_DEVICE_ID_INTEL_82801DB_12:
|
||||
- is_lpcm = 1;
|
||||
- break;
|
||||
- }
|
||||
- /* init ICH (enable LPC) */
|
||||
- pci_read_config_dword(pci_dev, PCI_GEN1_DEC, &lpcenable);
|
||||
- lpcenable |= 0x20000000;
|
||||
- pci_write_config_dword(pci_dev, PCI_GEN1_DEC, lpcenable);
|
||||
-
|
||||
- if (is_lpcm) {
|
||||
- pci_read_config_dword(pci_dev, PCI_GEN1_DEC,
|
||||
- &lpcenable);
|
||||
- if ((lpcenable & 0x20000000) == 0) {
|
||||
- dev_err(&pci_dev->dev,
|
||||
- "cannot enable LPC\n");
|
||||
- return -ENODEV;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* initialize TPM registers */
|
||||
- pci_read_config_dword(pci_dev, PCI_GEN2_DEC, &tmp);
|
||||
-
|
||||
- if (!is_lpcm)
|
||||
- tmp = (tmp & 0xFFFF0000) | (base & 0xFFF0);
|
||||
- else
|
||||
- tmp =
|
||||
- (tmp & 0xFFFF0000) | (base & 0xFFF0) |
|
||||
- 0x00000001;
|
||||
-
|
||||
- pci_write_config_dword(pci_dev, PCI_GEN2_DEC, tmp);
|
||||
-
|
||||
- if (is_lpcm) {
|
||||
- pci_read_config_dword(pci_dev, PCI_GEN_PMCON_1,
|
||||
- &tmp);
|
||||
- tmp |= 0x00000004; /* enable CLKRUN */
|
||||
- pci_write_config_dword(pci_dev, PCI_GEN_PMCON_1,
|
||||
- tmp);
|
||||
- }
|
||||
- tpm_write_index(0x0D, 0x55); /* unlock 4F */
|
||||
- tpm_write_index(0x0A, 0x00); /* int disable */
|
||||
- tpm_write_index(0x08, base); /* base addr lo */
|
||||
- tpm_write_index(0x09, (base & 0xFF00) >> 8); /* base addr hi */
|
||||
- tpm_write_index(0x0D, 0xAA); /* lock 4F */
|
||||
- break;
|
||||
- case PCI_VENDOR_ID_AMD:
|
||||
- /* nothing yet */
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-EXPORT_SYMBOL_GPL(tpm_lpc_bus_init);
|
||||
-
|
||||
-/*
|
||||
* Internal kernel interface to transmit TPM commands
|
||||
*/
|
||||
static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
|
||||
@@ -590,10 +518,6 @@ int tpm_pm_resume(struct pci_dev *pci_de
|
||||
if (chip == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
- spin_lock(&driver_lock);
|
||||
- tpm_lpc_bus_init(pci_dev, chip->vendor->base);
|
||||
- spin_unlock(&driver_lock);
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
|
||||
--- a/drivers/char/tpm/tpm.h
|
||||
+++ b/drivers/char/tpm/tpm.h
|
||||
@@ -79,8 +79,6 @@ static inline void tpm_write_index(int i
|
||||
}
|
||||
|
||||
extern void tpm_time_expired(unsigned long);
|
||||
-extern int tpm_lpc_bus_init(struct pci_dev *, u16);
|
||||
-
|
||||
extern int tpm_register_hardware(struct pci_dev *,
|
||||
struct tpm_vendor_specific *);
|
||||
extern int tpm_open(struct inode *, struct file *);
|
||||
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
|
||||
--- a/drivers/char/tpm/tpm_atmel.c
|
||||
+++ b/drivers/char/tpm/tpm_atmel.c
|
||||
@@ -22,7 +22,10 @@
|
||||
#include "tpm.h"
|
||||
|
||||
/* Atmel definitions */
|
||||
-#define TPM_ATML_BASE 0x400
|
||||
+enum tpm_atmel_addr {
|
||||
+ TPM_ATMEL_BASE_ADDR_LO = 0x08,
|
||||
+ TPM_ATMEL_BASE_ADDR_HI = 0x09
|
||||
+};
|
||||
|
||||
/* write status bits */
|
||||
#define ATML_STATUS_ABORT 0x01
|
||||
@@ -127,7 +130,6 @@ static struct tpm_vendor_specific tpm_at
|
||||
.cancel = tpm_atml_cancel,
|
||||
.req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL,
|
||||
.req_complete_val = ATML_STATUS_DATA_AVAIL,
|
||||
- .base = TPM_ATML_BASE,
|
||||
.miscdev = { .fops = &atmel_ops, },
|
||||
};
|
||||
|
||||
@@ -136,14 +138,16 @@ static int __devinit tpm_atml_init(struc
|
||||
{
|
||||
u8 version[4];
|
||||
int rc = 0;
|
||||
+ int lo, hi;
|
||||
|
||||
if (pci_enable_device(pci_dev))
|
||||
return -EIO;
|
||||
|
||||
- if (tpm_lpc_bus_init(pci_dev, TPM_ATML_BASE)) {
|
||||
- rc = -ENODEV;
|
||||
- goto out_err;
|
||||
- }
|
||||
+ lo = tpm_read_index( TPM_ATMEL_BASE_ADDR_LO );
|
||||
+ hi = tpm_read_index( TPM_ATMEL_BASE_ADDR_HI );
|
||||
+
|
||||
+ tpm_atmel.base = (hi<<8)|lo;
|
||||
+ dev_dbg( &pci_dev->dev, "Operating with base: 0x%x\n", tpm_atmel.base);
|
||||
|
||||
/* verify that it is an Atmel part */
|
||||
if (tpm_read_index(4) != 'A' || tpm_read_index(5) != 'T'
|
||||
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
|
||||
--- a/drivers/char/tpm/tpm_nsc.c
|
||||
+++ b/drivers/char/tpm/tpm_nsc.c
|
||||
@@ -24,6 +24,10 @@
|
||||
/* National definitions */
|
||||
#define TPM_NSC_BASE 0x360
|
||||
#define TPM_NSC_IRQ 0x07
|
||||
+#define TPM_NSC_BASE0_HI 0x60
|
||||
+#define TPM_NSC_BASE0_LO 0x61
|
||||
+#define TPM_NSC_BASE1_HI 0x62
|
||||
+#define TPM_NSC_BASE1_LO 0x63
|
||||
|
||||
#define NSC_LDN_INDEX 0x07
|
||||
#define NSC_SID_INDEX 0x20
|
||||
@@ -234,7 +238,6 @@ static struct tpm_vendor_specific tpm_ns
|
||||
.cancel = tpm_nsc_cancel,
|
||||
.req_complete_mask = NSC_STATUS_OBF,
|
||||
.req_complete_val = NSC_STATUS_OBF,
|
||||
- .base = TPM_NSC_BASE,
|
||||
.miscdev = { .fops = &nsc_ops, },
|
||||
|
||||
};
|
||||
@@ -243,15 +246,16 @@ static int __devinit tpm_nsc_init(struct
|
||||
const struct pci_device_id *pci_id)
|
||||
{
|
||||
int rc = 0;
|
||||
+ int lo, hi;
|
||||
+
|
||||
+ hi = tpm_read_index(TPM_NSC_BASE0_HI);
|
||||
+ lo = tpm_read_index(TPM_NSC_BASE0_LO);
|
||||
+
|
||||
+ tpm_nsc.base = (hi<<8) | lo;
|
||||
|
||||
if (pci_enable_device(pci_dev))
|
||||
return -EIO;
|
||||
|
||||
- if (tpm_lpc_bus_init(pci_dev, TPM_NSC_BASE)) {
|
||||
- rc = -ENODEV;
|
||||
- goto out_err;
|
||||
- }
|
||||
-
|
||||
/* verify that it is a National part (SID) */
|
||||
if (tpm_read_index(NSC_SID_INDEX) != 0xEF) {
|
||||
rc = -ENODEV;
|
||||
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
|
||||
--- a/drivers/char/tty_ioctl.c
|
||||
+++ b/drivers/char/tty_ioctl.c
|
||||
@@ -476,11 +476,11 @@ int n_tty_ioctl(struct tty_struct * tty,
|
||||
ld = tty_ldisc_ref(tty);
|
||||
switch (arg) {
|
||||
case TCIFLUSH:
|
||||
- if (ld->flush_buffer)
|
||||
+ if (ld && ld->flush_buffer)
|
||||
ld->flush_buffer(tty);
|
||||
break;
|
||||
case TCIOFLUSH:
|
||||
- if (ld->flush_buffer)
|
||||
+ if (ld && ld->flush_buffer)
|
||||
ld->flush_buffer(tty);
|
||||
/* fall through */
|
||||
case TCOFLUSH:
|
||||
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
|
||||
--- a/drivers/media/video/cx88/cx88-video.c
|
||||
+++ b/drivers/media/video/cx88/cx88-video.c
|
||||
@@ -261,7 +261,7 @@ static struct cx88_ctrl cx8800_ctls[] =
|
||||
.default_value = 0,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
},
|
||||
- .off = 0,
|
||||
+ .off = 128,
|
||||
.reg = MO_HUE,
|
||||
.mask = 0x00ff,
|
||||
.shift = 0,
|
||||
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
|
||||
--- a/drivers/net/hamradio/Kconfig
|
||||
+++ b/drivers/net/hamradio/Kconfig
|
||||
@@ -17,7 +17,7 @@ config MKISS
|
||||
|
||||
config 6PACK
|
||||
tristate "Serial port 6PACK driver"
|
||||
- depends on AX25 && BROKEN_ON_SMP
|
||||
+ depends on AX25
|
||||
---help---
|
||||
6pack is a transmission protocol for the data exchange between your
|
||||
PC and your TNC (the Terminal Node Controller acts as a kind of
|
||||
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
|
||||
--- a/drivers/net/shaper.c
|
||||
+++ b/drivers/net/shaper.c
|
||||
@@ -135,10 +135,8 @@ static int shaper_start_xmit(struct sk_b
|
||||
{
|
||||
struct shaper *shaper = dev->priv;
|
||||
struct sk_buff *ptr;
|
||||
-
|
||||
- if (down_trylock(&shaper->sem))
|
||||
- return -1;
|
||||
|
||||
+ spin_lock(&shaper->lock);
|
||||
ptr=shaper->sendq.prev;
|
||||
|
||||
/*
|
||||
@@ -232,7 +230,7 @@ static int shaper_start_xmit(struct sk_b
|
||||
shaper->stats.collisions++;
|
||||
}
|
||||
shaper_kick(shaper);
|
||||
- up(&shaper->sem);
|
||||
+ spin_unlock(&shaper->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -271,11 +269,9 @@ static void shaper_timer(unsigned long d
|
||||
{
|
||||
struct shaper *shaper = (struct shaper *)data;
|
||||
|
||||
- if (!down_trylock(&shaper->sem)) {
|
||||
- shaper_kick(shaper);
|
||||
- up(&shaper->sem);
|
||||
- } else
|
||||
- mod_timer(&shaper->timer, jiffies);
|
||||
+ spin_lock(&shaper->lock);
|
||||
+ shaper_kick(shaper);
|
||||
+ spin_unlock(&shaper->lock);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -332,21 +328,6 @@ static void shaper_kick(struct shaper *s
|
||||
|
||||
|
||||
/*
|
||||
- * Flush the shaper queues on a closedown
|
||||
- */
|
||||
-
|
||||
-static void shaper_flush(struct shaper *shaper)
|
||||
-{
|
||||
- struct sk_buff *skb;
|
||||
-
|
||||
- down(&shaper->sem);
|
||||
- while((skb=skb_dequeue(&shaper->sendq))!=NULL)
|
||||
- dev_kfree_skb(skb);
|
||||
- shaper_kick(shaper);
|
||||
- up(&shaper->sem);
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
* Bring the interface up. We just disallow this until a
|
||||
* bind.
|
||||
*/
|
||||
@@ -375,7 +356,15 @@ static int shaper_open(struct net_device
|
||||
static int shaper_close(struct net_device *dev)
|
||||
{
|
||||
struct shaper *shaper=dev->priv;
|
||||
- shaper_flush(shaper);
|
||||
+ struct sk_buff *skb;
|
||||
+
|
||||
+ while ((skb = skb_dequeue(&shaper->sendq)) != NULL)
|
||||
+ dev_kfree_skb(skb);
|
||||
+
|
||||
+ spin_lock_bh(&shaper->lock);
|
||||
+ shaper_kick(shaper);
|
||||
+ spin_unlock_bh(&shaper->lock);
|
||||
+
|
||||
del_timer_sync(&shaper->timer);
|
||||
return 0;
|
||||
}
|
||||
@@ -576,6 +565,7 @@ static void shaper_init_priv(struct net_
|
||||
init_timer(&sh->timer);
|
||||
sh->timer.function=shaper_timer;
|
||||
sh->timer.data=(unsigned long)sh;
|
||||
+ spin_lock_init(&sh->lock);
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/fs/char_dev.c b/fs/char_dev.c
|
||||
--- a/fs/char_dev.c
|
||||
+++ b/fs/char_dev.c
|
||||
@@ -139,7 +139,7 @@ __unregister_chrdev_region(unsigned majo
|
||||
struct char_device_struct *cd = NULL, **cp;
|
||||
int i = major_to_index(major);
|
||||
|
||||
- up(&chrdevs_lock);
|
||||
+ down(&chrdevs_lock);
|
||||
for (cp = &chrdevs[i]; *cp; cp = &(*cp)->next)
|
||||
if ((*cp)->major == major &&
|
||||
(*cp)->baseminor == baseminor &&
|
||||
diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
|
||||
--- a/include/linux/if_shaper.h
|
||||
+++ b/include/linux/if_shaper.h
|
||||
@@ -23,7 +23,7 @@ struct shaper
|
||||
__u32 shapeclock;
|
||||
unsigned long recovery; /* Time we can next clock a packet out on
|
||||
an empty queue */
|
||||
- struct semaphore sem;
|
||||
+ spinlock_t lock;
|
||||
struct net_device_stats stats;
|
||||
struct net_device *dev;
|
||||
int (*hard_start_xmit) (struct sk_buff *skb,
|
||||
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
|
||||
--- a/net/ipv4/ip_output.c
|
||||
+++ b/net/ipv4/ip_output.c
|
||||
@@ -111,7 +111,6 @@ static int ip_dev_loopback_xmit(struct s
|
||||
#ifdef CONFIG_NETFILTER_DEBUG
|
||||
nf_debug_ip_loopback_xmit(newskb);
|
||||
#endif
|
||||
- nf_reset(newskb);
|
||||
netif_rx(newskb);
|
||||
return 0;
|
||||
}
|
||||
@@ -196,8 +195,6 @@ static inline int ip_finish_output2(stru
|
||||
nf_debug_ip_finish_output2(skb);
|
||||
#endif /*CONFIG_NETFILTER_DEBUG*/
|
||||
|
||||
- nf_reset(skb);
|
||||
-
|
||||
if (hh) {
|
||||
int hh_alen;
|
||||
|
||||
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
|
||||
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
|
||||
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
|
||||
@@ -432,6 +432,13 @@ static unsigned int ip_conntrack_defrag(
|
||||
const struct net_device *out,
|
||||
int (*okfn)(struct sk_buff *))
|
||||
{
|
||||
+#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE)
|
||||
+ /* Previously seen (loopback)? Ignore. Do this before
|
||||
+ fragment check. */
|
||||
+ if ((*pskb)->nfct)
|
||||
+ return NF_ACCEPT;
|
||||
+#endif
|
||||
+
|
||||
/* Gather fragments. */
|
||||
if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
|
||||
*pskb = ip_ct_gather_frags(*pskb,
|
||||
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
|
||||
--- a/net/packet/af_packet.c
|
||||
+++ b/net/packet/af_packet.c
|
||||
@@ -274,6 +274,9 @@ static int packet_rcv_spkt(struct sk_buf
|
||||
dst_release(skb->dst);
|
||||
skb->dst = NULL;
|
||||
|
||||
+ /* drop conntrack reference */
|
||||
+ nf_reset(skb);
|
||||
+
|
||||
spkt = (struct sockaddr_pkt*)skb->cb;
|
||||
|
||||
skb_push(skb, skb->data-skb->mac.raw);
|
||||
@@ -517,6 +520,9 @@ static int packet_rcv(struct sk_buff *sk
|
||||
dst_release(skb->dst);
|
||||
skb->dst = NULL;
|
||||
|
||||
+ /* drop conntrack reference */
|
||||
+ nf_reset(skb);
|
||||
+
|
||||
spin_lock(&sk->sk_receive_queue.lock);
|
||||
po->stats.tp_packets++;
|
||||
__skb_queue_tail(&sk->sk_receive_queue, skb);
|
||||
|
|
@ -1,194 +0,0 @@
|
|||
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
|
||||
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
|
||||
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
#define PFX "powernow-k8: "
|
||||
#define BFX PFX "BIOS error: "
|
||||
-#define VERSION "version 1.40.2"
|
||||
+#define VERSION "version 1.40.4"
|
||||
#include "powernow-k8.h"
|
||||
|
||||
/* serialize freq changes */
|
||||
@@ -978,7 +978,7 @@ static int __init powernowk8_cpu_init(st
|
||||
{
|
||||
struct powernow_k8_data *data;
|
||||
cpumask_t oldmask = CPU_MASK_ALL;
|
||||
- int rc;
|
||||
+ int rc, i;
|
||||
|
||||
if (!check_supported_cpu(pol->cpu))
|
||||
return -ENODEV;
|
||||
@@ -1064,7 +1064,9 @@ static int __init powernowk8_cpu_init(st
|
||||
printk("cpu_init done, current fid 0x%x, vid 0x%x\n",
|
||||
data->currfid, data->currvid);
|
||||
|
||||
- powernow_data[pol->cpu] = data;
|
||||
+ for_each_cpu_mask(i, cpu_core_map[pol->cpu]) {
|
||||
+ powernow_data[i] = data;
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
|
||||
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
|
||||
--- a/arch/i386/kernel/process.c
|
||||
+++ b/arch/i386/kernel/process.c
|
||||
@@ -827,6 +827,8 @@ asmlinkage int sys_get_thread_area(struc
|
||||
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
+ memset(&info, 0, sizeof(info));
|
||||
+
|
||||
desc = current->thread.tls_array + idx - GDT_ENTRY_TLS_MIN;
|
||||
|
||||
info.entry_number = idx;
|
||||
diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86_64/ia32/syscall32.c
|
||||
--- a/arch/x86_64/ia32/syscall32.c
|
||||
+++ b/arch/x86_64/ia32/syscall32.c
|
||||
@@ -57,6 +57,7 @@ int syscall32_setup_pages(struct linux_b
|
||||
int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
|
||||
struct vm_area_struct *vma;
|
||||
struct mm_struct *mm = current->mm;
|
||||
+ int ret;
|
||||
|
||||
vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
|
||||
if (!vma)
|
||||
@@ -78,7 +79,11 @@ int syscall32_setup_pages(struct linux_b
|
||||
vma->vm_mm = mm;
|
||||
|
||||
down_write(&mm->mmap_sem);
|
||||
- insert_vm_struct(mm, vma);
|
||||
+ if ((ret = insert_vm_struct(mm, vma))) {
|
||||
+ up_write(&mm->mmap_sem);
|
||||
+ kmem_cache_free(vm_area_cachep, vma);
|
||||
+ return ret;
|
||||
+ }
|
||||
mm->total_vm += npages;
|
||||
up_write(&mm->mmap_sem);
|
||||
return 0;
|
||||
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
|
||||
--- a/drivers/char/rocket.c
|
||||
+++ b/drivers/char/rocket.c
|
||||
@@ -277,7 +277,7 @@ static void rp_do_receive(struct r_port
|
||||
ToRecv = space;
|
||||
|
||||
if (ToRecv <= 0)
|
||||
- return;
|
||||
+ goto done;
|
||||
|
||||
/*
|
||||
* if status indicates there are errored characters in the
|
||||
@@ -359,6 +359,7 @@ static void rp_do_receive(struct r_port
|
||||
}
|
||||
/* Push the data up to the tty layer */
|
||||
ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count);
|
||||
+done:
|
||||
tty_ldisc_deref(ld);
|
||||
}
|
||||
|
||||
diff --git a/fs/bio.c b/fs/bio.c
|
||||
--- a/fs/bio.c
|
||||
+++ b/fs/bio.c
|
||||
@@ -261,6 +261,7 @@ inline void __bio_clone(struct bio *bio,
|
||||
*/
|
||||
bio->bi_vcnt = bio_src->bi_vcnt;
|
||||
bio->bi_size = bio_src->bi_size;
|
||||
+ bio->bi_idx = bio_src->bi_idx;
|
||||
bio_phys_segments(q, bio);
|
||||
bio_hw_segments(q, bio);
|
||||
}
|
||||
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1192,7 +1192,7 @@ static inline void *skb_header_pointer(c
|
||||
{
|
||||
int hlen = skb_headlen(skb);
|
||||
|
||||
- if (offset + len <= hlen)
|
||||
+ if (hlen - offset >= len)
|
||||
return skb->data + offset;
|
||||
|
||||
if (skb_copy_bits(skb, offset, buffer, len) < 0)
|
||||
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
|
||||
--- a/net/8021q/vlan.c
|
||||
+++ b/net/8021q/vlan.c
|
||||
@@ -578,6 +578,14 @@ static int vlan_device_event(struct noti
|
||||
if (!vlandev)
|
||||
continue;
|
||||
|
||||
+ if (netif_carrier_ok(dev)) {
|
||||
+ if (!netif_carrier_ok(vlandev))
|
||||
+ netif_carrier_on(vlandev);
|
||||
+ } else {
|
||||
+ if (netif_carrier_ok(vlandev))
|
||||
+ netif_carrier_off(vlandev);
|
||||
+ }
|
||||
+
|
||||
if ((vlandev->state & VLAN_LINK_STATE_MASK) != flgs) {
|
||||
vlandev->state = (vlandev->state &~ VLAN_LINK_STATE_MASK)
|
||||
| flgs;
|
||||
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
|
||||
--- a/net/ipv4/netfilter/ip_conntrack_core.c
|
||||
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
|
||||
@@ -1124,6 +1124,9 @@ void ip_conntrack_cleanup(void)
|
||||
schedule();
|
||||
goto i_see_dead_people;
|
||||
}
|
||||
+ /* wait until all references to ip_conntrack_untracked are dropped */
|
||||
+ while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1)
|
||||
+ schedule();
|
||||
|
||||
kmem_cache_destroy(ip_conntrack_cachep);
|
||||
kmem_cache_destroy(ip_conntrack_expect_cachep);
|
||||
diff --git a/net/ipv4/netfilter/ip_nat_proto_tcp.c b/net/ipv4/netfilter/ip_nat_proto_tcp.c
|
||||
--- a/net/ipv4/netfilter/ip_nat_proto_tcp.c
|
||||
+++ b/net/ipv4/netfilter/ip_nat_proto_tcp.c
|
||||
@@ -40,7 +40,8 @@ tcp_unique_tuple(struct ip_conntrack_tup
|
||||
enum ip_nat_manip_type maniptype,
|
||||
const struct ip_conntrack *conntrack)
|
||||
{
|
||||
- static u_int16_t port, *portptr;
|
||||
+ static u_int16_t port;
|
||||
+ u_int16_t *portptr;
|
||||
unsigned int range_size, min, i;
|
||||
|
||||
if (maniptype == IP_NAT_MANIP_SRC)
|
||||
diff --git a/net/ipv4/netfilter/ip_nat_proto_udp.c b/net/ipv4/netfilter/ip_nat_proto_udp.c
|
||||
--- a/net/ipv4/netfilter/ip_nat_proto_udp.c
|
||||
+++ b/net/ipv4/netfilter/ip_nat_proto_udp.c
|
||||
@@ -41,7 +41,8 @@ udp_unique_tuple(struct ip_conntrack_tup
|
||||
enum ip_nat_manip_type maniptype,
|
||||
const struct ip_conntrack *conntrack)
|
||||
{
|
||||
- static u_int16_t port, *portptr;
|
||||
+ static u_int16_t port;
|
||||
+ u_int16_t *portptr;
|
||||
unsigned int range_size, min, i;
|
||||
|
||||
if (maniptype == IP_NAT_MANIP_SRC)
|
||||
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
|
||||
--- a/net/ipv6/netfilter/ip6_queue.c
|
||||
+++ b/net/ipv6/netfilter/ip6_queue.c
|
||||
@@ -76,7 +76,9 @@ static DECLARE_MUTEX(ipqnl_sem);
|
||||
static void
|
||||
ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
|
||||
{
|
||||
+ local_bh_disable();
|
||||
nf_reinject(entry->skb, entry->info, verdict);
|
||||
+ local_bh_enable();
|
||||
kfree(entry);
|
||||
}
|
||||
|
||||
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
|
||||
--- a/net/xfrm/xfrm_user.c
|
||||
+++ b/net/xfrm/xfrm_user.c
|
||||
@@ -1180,6 +1180,9 @@ static struct xfrm_policy *xfrm_compile_
|
||||
if (nr > XFRM_MAX_DEPTH)
|
||||
return NULL;
|
||||
|
||||
+ if (p->dir > XFRM_POLICY_OUT)
|
||||
+ return NULL;
|
||||
+
|
||||
xp = xfrm_policy_alloc(GFP_KERNEL);
|
||||
if (xp == NULL) {
|
||||
*dir = -ENOBUFS;
|
||||
|
|
@ -1,352 +0,0 @@
|
|||
diff --git a/arch/ppc64/boot/zlib.c b/arch/ppc64/boot/zlib.c
|
||||
--- a/arch/ppc64/boot/zlib.c
|
||||
+++ b/arch/ppc64/boot/zlib.c
|
||||
@@ -1307,7 +1307,7 @@ local int huft_build(
|
||||
{
|
||||
*t = (inflate_huft *)Z_NULL;
|
||||
*m = 0;
|
||||
- return Z_OK;
|
||||
+ return Z_DATA_ERROR;
|
||||
}
|
||||
|
||||
|
||||
@@ -1351,6 +1351,7 @@ local int huft_build(
|
||||
if ((j = *p++) != 0)
|
||||
v[x[j]++] = i;
|
||||
} while (++i < n);
|
||||
+ n = x[g]; /* set n to length of v */
|
||||
|
||||
|
||||
/* Generate the Huffman codes and for each, make the table entries */
|
||||
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
|
||||
--- a/arch/x86_64/kernel/setup.c
|
||||
+++ b/arch/x86_64/kernel/setup.c
|
||||
@@ -729,8 +729,6 @@ static void __init amd_detect_cmp(struct
|
||||
int cpu = smp_processor_id();
|
||||
int node = 0;
|
||||
unsigned bits;
|
||||
- if (c->x86_num_cores == 1)
|
||||
- return;
|
||||
|
||||
bits = 0;
|
||||
while ((1 << bits) < c->x86_num_cores)
|
||||
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
|
||||
--- a/arch/x86_64/kernel/smp.c
|
||||
+++ b/arch/x86_64/kernel/smp.c
|
||||
@@ -284,6 +284,71 @@ struct call_data_struct {
|
||||
static struct call_data_struct * call_data;
|
||||
|
||||
/*
|
||||
+ * this function sends a 'generic call function' IPI to one other CPU
|
||||
+ * in the system.
|
||||
+ */
|
||||
+static void __smp_call_function_single (int cpu, void (*func) (void *info), void *info,
|
||||
+ int nonatomic, int wait)
|
||||
+{
|
||||
+ struct call_data_struct data;
|
||||
+ int cpus = 1;
|
||||
+
|
||||
+ data.func = func;
|
||||
+ data.info = info;
|
||||
+ atomic_set(&data.started, 0);
|
||||
+ data.wait = wait;
|
||||
+ if (wait)
|
||||
+ atomic_set(&data.finished, 0);
|
||||
+
|
||||
+ call_data = &data;
|
||||
+ wmb();
|
||||
+ /* Send a message to all other CPUs and wait for them to respond */
|
||||
+ send_IPI_mask(cpumask_of_cpu(cpu), CALL_FUNCTION_VECTOR);
|
||||
+
|
||||
+ /* Wait for response */
|
||||
+ while (atomic_read(&data.started) != cpus)
|
||||
+ cpu_relax();
|
||||
+
|
||||
+ if (!wait)
|
||||
+ return;
|
||||
+
|
||||
+ while (atomic_read(&data.finished) != cpus)
|
||||
+ cpu_relax();
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Run a function on another CPU
|
||||
+ * <func> The function to run. This must be fast and non-blocking.
|
||||
+ * <info> An arbitrary pointer to pass to the function.
|
||||
+ * <nonatomic> Currently unused.
|
||||
+ * <wait> If true, wait until function has completed on other CPUs.
|
||||
+ * [RETURNS] 0 on success, else a negative status code.
|
||||
+ *
|
||||
+ * Does not return until the remote CPU is nearly ready to execute <func>
|
||||
+ * or is or has executed.
|
||||
+ */
|
||||
+
|
||||
+int smp_call_function_single (int cpu, void (*func) (void *info), void *info,
|
||||
+ int nonatomic, int wait)
|
||||
+{
|
||||
+
|
||||
+ int me = get_cpu(); /* prevent preemption and reschedule on another processor */
|
||||
+
|
||||
+ if (cpu == me) {
|
||||
+ printk("%s: trying to call self\n", __func__);
|
||||
+ put_cpu();
|
||||
+ return -EBUSY;
|
||||
+ }
|
||||
+ spin_lock_bh(&call_lock);
|
||||
+
|
||||
+ __smp_call_function_single(cpu, func,info,nonatomic,wait);
|
||||
+
|
||||
+ spin_unlock_bh(&call_lock);
|
||||
+ put_cpu();
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* this function sends a 'generic call function' IPI to all other CPUs
|
||||
* in the system.
|
||||
*/
|
||||
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
|
||||
--- a/arch/x86_64/kernel/smpboot.c
|
||||
+++ b/arch/x86_64/kernel/smpboot.c
|
||||
@@ -202,9 +202,6 @@ static __cpuinit void sync_master(void *
|
||||
{
|
||||
unsigned long flags, i;
|
||||
|
||||
- if (smp_processor_id() != boot_cpu_id)
|
||||
- return;
|
||||
-
|
||||
go[MASTER] = 0;
|
||||
|
||||
local_irq_save(flags);
|
||||
@@ -253,7 +250,7 @@ get_delta(long *rt, long *master)
|
||||
return tcenter - best_tm;
|
||||
}
|
||||
|
||||
-static __cpuinit void sync_tsc(void)
|
||||
+static __cpuinit void sync_tsc(unsigned int master)
|
||||
{
|
||||
int i, done = 0;
|
||||
long delta, adj, adjust_latency = 0;
|
||||
@@ -267,9 +264,17 @@ static __cpuinit void sync_tsc(void)
|
||||
} t[NUM_ROUNDS] __cpuinitdata;
|
||||
#endif
|
||||
|
||||
+ printk(KERN_INFO "CPU %d: Syncing TSC to CPU %u.\n",
|
||||
+ smp_processor_id(), master);
|
||||
+
|
||||
go[MASTER] = 1;
|
||||
|
||||
- smp_call_function(sync_master, NULL, 1, 0);
|
||||
+ /* It is dangerous to broadcast IPI as cpus are coming up,
|
||||
+ * as they may not be ready to accept them. So since
|
||||
+ * we only need to send the ipi to the boot cpu direct
|
||||
+ * the message, and avoid the race.
|
||||
+ */
|
||||
+ smp_call_function_single(master, sync_master, NULL, 1, 0);
|
||||
|
||||
while (go[MASTER]) /* wait for master to be ready */
|
||||
no_cpu_relax();
|
||||
@@ -313,16 +318,14 @@ static __cpuinit void sync_tsc(void)
|
||||
printk(KERN_INFO
|
||||
"CPU %d: synchronized TSC with CPU %u (last diff %ld cycles, "
|
||||
"maxerr %lu cycles)\n",
|
||||
- smp_processor_id(), boot_cpu_id, delta, rt);
|
||||
+ smp_processor_id(), master, delta, rt);
|
||||
}
|
||||
|
||||
static void __cpuinit tsc_sync_wait(void)
|
||||
{
|
||||
if (notscsync || !cpu_has_tsc)
|
||||
return;
|
||||
- printk(KERN_INFO "CPU %d: Syncing TSC to CPU %u.\n", smp_processor_id(),
|
||||
- boot_cpu_id);
|
||||
- sync_tsc();
|
||||
+ sync_tsc(0);
|
||||
}
|
||||
|
||||
static __init int notscsync_setup(char *s)
|
||||
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
|
||||
--- a/fs/isofs/compress.c
|
||||
+++ b/fs/isofs/compress.c
|
||||
@@ -129,8 +129,14 @@ static int zisofs_readpage(struct file *
|
||||
cend = le32_to_cpu(*(__le32 *)(bh->b_data + (blockendptr & bufmask)));
|
||||
brelse(bh);
|
||||
|
||||
+ if (cstart > cend)
|
||||
+ goto eio;
|
||||
+
|
||||
csize = cend-cstart;
|
||||
|
||||
+ if (csize > deflateBound(1UL << zisofs_block_shift))
|
||||
+ goto eio;
|
||||
+
|
||||
/* Now page[] contains an array of pages, any of which can be NULL,
|
||||
and the locks on which we hold. We should now read the data and
|
||||
release the pages. If the pages are NULL the decompressed data
|
||||
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h
|
||||
--- a/include/asm-x86_64/smp.h
|
||||
+++ b/include/asm-x86_64/smp.h
|
||||
@@ -46,6 +46,8 @@ extern int pic_mode;
|
||||
extern int smp_num_siblings;
|
||||
extern void smp_flush_tlb(void);
|
||||
extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
|
||||
+extern int smp_call_function_single (int cpuid, void (*func) (void *info), void *info,
|
||||
+ int retry, int wait);
|
||||
extern void smp_send_reschedule(int cpu);
|
||||
extern void smp_invalidate_rcv(void); /* Process an NMI */
|
||||
extern void zap_low_mappings(void);
|
||||
diff --git a/include/linux/zlib.h b/include/linux/zlib.h
|
||||
--- a/include/linux/zlib.h
|
||||
+++ b/include/linux/zlib.h
|
||||
@@ -506,6 +506,11 @@ extern int zlib_deflateReset (z_streamp
|
||||
stream state was inconsistent (such as zalloc or state being NULL).
|
||||
*/
|
||||
|
||||
+static inline unsigned long deflateBound(unsigned long s)
|
||||
+{
|
||||
+ return s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11;
|
||||
+}
|
||||
+
|
||||
extern int zlib_deflateParams (z_streamp strm, int level, int strategy);
|
||||
/*
|
||||
Dynamically update the compression level and compression strategy. The
|
||||
diff --git a/kernel/module.c b/kernel/module.c
|
||||
--- a/kernel/module.c
|
||||
+++ b/kernel/module.c
|
||||
@@ -249,13 +249,18 @@ static inline unsigned int block_size(in
|
||||
/* Created by linker magic */
|
||||
extern char __per_cpu_start[], __per_cpu_end[];
|
||||
|
||||
-static void *percpu_modalloc(unsigned long size, unsigned long align)
|
||||
+static void *percpu_modalloc(unsigned long size, unsigned long align,
|
||||
+ const char *name)
|
||||
{
|
||||
unsigned long extra;
|
||||
unsigned int i;
|
||||
void *ptr;
|
||||
|
||||
- BUG_ON(align > SMP_CACHE_BYTES);
|
||||
+ if (align > SMP_CACHE_BYTES) {
|
||||
+ printk(KERN_WARNING "%s: per-cpu alignment %li > %i\n",
|
||||
+ name, align, SMP_CACHE_BYTES);
|
||||
+ align = SMP_CACHE_BYTES;
|
||||
+ }
|
||||
|
||||
ptr = __per_cpu_start;
|
||||
for (i = 0; i < pcpu_num_used; ptr += block_size(pcpu_size[i]), i++) {
|
||||
@@ -347,7 +352,8 @@ static int percpu_modinit(void)
|
||||
}
|
||||
__initcall(percpu_modinit);
|
||||
#else /* ... !CONFIG_SMP */
|
||||
-static inline void *percpu_modalloc(unsigned long size, unsigned long align)
|
||||
+static inline void *percpu_modalloc(unsigned long size, unsigned long align,
|
||||
+ const char *name)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@@ -1554,7 +1560,8 @@ static struct module *load_module(void _
|
||||
if (pcpuindex) {
|
||||
/* We have a special allocation for this section. */
|
||||
percpu = percpu_modalloc(sechdrs[pcpuindex].sh_size,
|
||||
- sechdrs[pcpuindex].sh_addralign);
|
||||
+ sechdrs[pcpuindex].sh_addralign,
|
||||
+ mod->name);
|
||||
if (!percpu) {
|
||||
err = -ENOMEM;
|
||||
goto free_mod;
|
||||
diff --git a/lib/inflate.c b/lib/inflate.c
|
||||
--- a/lib/inflate.c
|
||||
+++ b/lib/inflate.c
|
||||
@@ -326,7 +326,7 @@ DEBG("huft1 ");
|
||||
{
|
||||
*t = (struct huft *)NULL;
|
||||
*m = 0;
|
||||
- return 0;
|
||||
+ return 2;
|
||||
}
|
||||
|
||||
DEBG("huft2 ");
|
||||
@@ -374,6 +374,7 @@ DEBG("huft5 ");
|
||||
if ((j = *p++) != 0)
|
||||
v[x[j]++] = i;
|
||||
} while (++i < n);
|
||||
+ n = x[g]; /* set n to length of v */
|
||||
|
||||
DEBG("h6 ");
|
||||
|
||||
@@ -410,12 +411,13 @@ DEBG1("1 ");
|
||||
DEBG1("2 ");
|
||||
f -= a + 1; /* deduct codes from patterns left */
|
||||
xp = c + k;
|
||||
- while (++j < z) /* try smaller tables up to z bits */
|
||||
- {
|
||||
- if ((f <<= 1) <= *++xp)
|
||||
- break; /* enough codes to use up j bits */
|
||||
- f -= *xp; /* else deduct codes from patterns */
|
||||
- }
|
||||
+ if (j < z)
|
||||
+ while (++j < z) /* try smaller tables up to z bits */
|
||||
+ {
|
||||
+ if ((f <<= 1) <= *++xp)
|
||||
+ break; /* enough codes to use up j bits */
|
||||
+ f -= *xp; /* else deduct codes from patterns */
|
||||
+ }
|
||||
}
|
||||
DEBG1("3 ");
|
||||
z = 1 << j; /* table entries for j-bit table */
|
||||
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
|
||||
--- a/lib/zlib_inflate/inftrees.c
|
||||
+++ b/lib/zlib_inflate/inftrees.c
|
||||
@@ -141,7 +141,7 @@ static int huft_build(
|
||||
{
|
||||
*t = NULL;
|
||||
*m = 0;
|
||||
- return Z_OK;
|
||||
+ return Z_DATA_ERROR;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
|
||||
--- a/mm/mempolicy.c
|
||||
+++ b/mm/mempolicy.c
|
||||
@@ -409,7 +409,7 @@ asmlinkage long sys_set_mempolicy(int mo
|
||||
struct mempolicy *new;
|
||||
DECLARE_BITMAP(nodes, MAX_NUMNODES);
|
||||
|
||||
- if (mode > MPOL_MAX)
|
||||
+ if (mode < 0 || mode > MPOL_MAX)
|
||||
return -EINVAL;
|
||||
err = get_nodes(nodes, nmask, maxnode, mode);
|
||||
if (err)
|
||||
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
|
||||
--- a/security/keys/keyring.c
|
||||
+++ b/security/keys/keyring.c
|
||||
@@ -188,7 +188,11 @@ static void keyring_destroy(struct key *
|
||||
|
||||
if (keyring->description) {
|
||||
write_lock(&keyring_name_lock);
|
||||
- list_del(&keyring->type_data.link);
|
||||
+
|
||||
+ if (keyring->type_data.link.next != NULL &&
|
||||
+ !list_empty(&keyring->type_data.link))
|
||||
+ list_del(&keyring->type_data.link);
|
||||
+
|
||||
write_unlock(&keyring_name_lock);
|
||||
}
|
||||
|
||||
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
|
||||
--- a/security/keys/process_keys.c
|
||||
+++ b/security/keys/process_keys.c
|
||||
@@ -641,7 +641,7 @@ long join_session_keyring(const char *na
|
||||
keyring = keyring_alloc(name, tsk->uid, tsk->gid, 0, NULL);
|
||||
if (IS_ERR(keyring)) {
|
||||
ret = PTR_ERR(keyring);
|
||||
- goto error;
|
||||
+ goto error2;
|
||||
}
|
||||
}
|
||||
else if (IS_ERR(keyring)) {
|
||||
-
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-kernel-announce" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,18 @@
|
|||
#! /bin/sh -e
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: Description: Add driver_data member to vio_dev.
|
||||
## DP: Patch author: Bastian Blank <waldi@debian.org>
|
||||
## DP: Upstream status: unknown
|
||||
|
||||
diff -aurN a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h
|
||||
--- a/include/asm-ppc64/vio.h 2005-06-17 15:48:29.000000000 -0400
|
||||
+++ b/include/asm-ppc64/vio.h 2005-06-18 12:02:58.000000000 -0400
|
||||
@@ -91,6 +91,7 @@
|
||||
char *type;
|
||||
uint32_t unit_address;
|
||||
unsigned int irq;
|
||||
+ void *driver_data;
|
||||
|
||||
struct device dev;
|
||||
};
|
||||
|
|
@ -74,9 +74,9 @@ diff -aurN a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
|
|||
#
|
||||
-# CONFIG_USB_EMI62 is not set
|
||||
-# CONFIG_USB_EMI26 is not set
|
||||
# CONFIG_USB_TIGL is not set
|
||||
# CONFIG_USB_AUERSWALD is not set
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
diff -aurN a/arch/ia64/defconfig b/arch/ia64/defconfig
|
||||
--- a/arch/ia64/defconfig 2005-06-17 15:48:29.000000000 -0400
|
||||
+++ b/arch/ia64/defconfig 2005-06-18 16:28:03.000000000 -0400
|
||||
|
|
@ -86,8 +86,8 @@ diff -aurN a/arch/ia64/defconfig b/arch/ia64/defconfig
|
|||
# CONFIG_FORCEDETH is not set
|
||||
-# CONFIG_DGRS is not set
|
||||
CONFIG_EEPRO100=m
|
||||
# CONFIG_EEPRO100_PIO is not set
|
||||
CONFIG_E100=m
|
||||
# CONFIG_FEALNX is not set
|
||||
@@ -500,7 +499,6 @@
|
||||
#
|
||||
# Ethernet (1000 Mbit)
|
||||
|
|
@ -110,9 +110,9 @@ diff -aurN a/arch/ia64/defconfig b/arch/ia64/defconfig
|
|||
#
|
||||
-# CONFIG_USB_EMI62 is not set
|
||||
-# CONFIG_USB_EMI26 is not set
|
||||
# CONFIG_USB_TIGL is not set
|
||||
# CONFIG_USB_AUERSWALD is not set
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
diff -aurN a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
|
||||
--- a/arch/mips/configs/rm200_defconfig 2005-06-17 15:48:29.000000000 -0400
|
||||
+++ b/arch/mips/configs/rm200_defconfig 2005-06-18 16:27:28.000000000 -0400
|
||||
|
|
@ -134,9 +134,9 @@ diff -aurN a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconf
|
|||
#
|
||||
-# CONFIG_USB_EMI62 is not set
|
||||
-# CONFIG_USB_EMI26 is not set
|
||||
# CONFIG_USB_TIGL is not set
|
||||
# CONFIG_USB_AUERSWALD is not set
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
diff -aurN a/arch/ppc/configs/lopec_defconfig b/arch/ppc/configs/lopec_defconfig
|
||||
--- a/arch/ppc/configs/lopec_defconfig 2005-06-17 15:48:29.000000000 -0400
|
||||
+++ b/arch/ppc/configs/lopec_defconfig 2005-06-18 16:25:01.000000000 -0400
|
||||
|
|
@ -280,7 +280,7 @@ diff -aurN a/arch/x86_64/defconfig b/arch/x86_64/defconfig
|
|||
CONFIG_FORCEDETH=y
|
||||
-# CONFIG_DGRS is not set
|
||||
# CONFIG_EEPRO100 is not set
|
||||
# CONFIG_E100 is not set
|
||||
CONFIG_E100=y
|
||||
# CONFIG_FEALNX is not set
|
||||
@@ -550,7 +549,6 @@
|
||||
#
|
||||
|
|
@ -307,18 +307,6 @@ diff -aurN a/arch/x86_64/defconfig b/arch/x86_64/defconfig
|
|||
# CONFIG_USB_AUERSWALD is not set
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
diff -aurN a/drivers/usb/Makefile b/drivers/usb/Makefile
|
||||
--- a/drivers/usb/Makefile 2005-06-17 15:48:29.000000000 -0400
|
||||
+++ b/drivers/usb/Makefile 2005-06-18 16:32:12.000000000 -0400
|
||||
@@ -59,8 +59,6 @@
|
||||
|
||||
obj-$(CONFIG_USB_AUERSWALD) += misc/
|
||||
obj-$(CONFIG_USB_CYTHERM) += misc/
|
||||
-obj-$(CONFIG_USB_EMI26) += misc/
|
||||
-obj-$(CONFIG_USB_EMI62) += misc/
|
||||
obj-$(CONFIG_USB_IDMOUSE) += misc/
|
||||
obj-$(CONFIG_USB_LCD) += misc/
|
||||
obj-$(CONFIG_USB_LED) += misc/
|
||||
diff -aurN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
|
||||
--- a/drivers/usb/misc/Kconfig 2005-06-18 11:23:01.000000000 -0400
|
||||
+++ b/drivers/usb/misc/Kconfig 2005-06-18 16:31:32.000000000 -0400
|
||||
|
|
@ -342,9 +330,8 @@ diff -aurN a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
|
|||
config USB_AUERSWALD
|
||||
tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
|
||||
depends on USB && EXPERIMENTAL
|
||||
diff -aurN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
|
||||
--- a/drivers/usb/misc/Makefile 2005-06-18 11:23:01.000000000 -0400
|
||||
+++ b/drivers/usb/misc/Makefile 2005-06-18 16:31:47.000000000 -0400
|
||||
--- linux-2.6.13/drivers/usb/misc/Makefile.orig 2005-08-06 11:56:51.000000000 +0200
|
||||
+++ linux-2.6.13/drivers/usb/misc/Makefile 2005-08-06 11:58:37.000000000 +0200
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
obj-$(CONFIG_USB_AUERSWALD) += auerswald.o
|
||||
|
|
@ -352,11 +339,4 @@ diff -aurN a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
|
|||
-obj-$(CONFIG_USB_EMI26) += emi26.o
|
||||
obj-$(CONFIG_USB_IDMOUSE) += idmouse.o
|
||||
obj-$(CONFIG_USB_LCD) += usblcd.o
|
||||
obj-$(CONFIG_USB_LED) += usbled.o
|
||||
@@ -16,4 +15,4 @@
|
||||
obj-$(CONFIG_USB_TEST) += usbtest.o
|
||||
obj-$(CONFIG_USB_USS720) += uss720.o
|
||||
|
||||
-obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/
|
||||
\ No newline at end of file
|
||||
+obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/
|
||||
obj-$(CONFIG_USB_LD) += ldusb.o
|
||||
|
|
|
|||
|
|
@ -1,27 +1,20 @@
|
|||
+ amd64-int3-fix.patch
|
||||
+ drivers-add-scsi_changer.patch
|
||||
+ drivers-ide-__devinit.patch
|
||||
+ drivers-ide-dma-blacklist-toshiba.patch
|
||||
+ drivers-scsi-megaraid_splitup.patch
|
||||
+ fbdev-radeon-noaccel.patch
|
||||
+ fs-asfs-2.patch
|
||||
+ ia64-irq-affinity-upfix.patch
|
||||
+ modular-ide-pnp.patch
|
||||
+ modular-ide.patch
|
||||
+ modular-vesafb.patch
|
||||
+ modular-ide-pnp.patch
|
||||
+ powerpc-calibrate-tau.patch
|
||||
+ powerpc-fix-power3-ftbfs.patch
|
||||
+ powerpc-g3-750cxe.patch
|
||||
+ powerpc-g4-l2-flush-errata.patch
|
||||
+ powerpc-mkvmlinuz-support.patch
|
||||
+ powerpc-pmac-cache-power34-fix.patch
|
||||
+ powerpc-ppc64-vio-data.patch
|
||||
+ powerpc-serial.patch
|
||||
+ qla2xxx-removed.patch
|
||||
+ remove-references-to-removed-drivers.patch
|
||||
+ tty-locking-fixes9.patch
|
||||
+ ia64-generic-nosmp.patch
|
||||
+ patch-2.6.12.1
|
||||
+ powerpc-ppc64-biarch-override.patch
|
||||
+ patch-2.6.12.2
|
||||
+ powerpc-mkvmlinuz-support.patch
|
||||
+ patch-2.6.12.3
|
||||
+ sparc64-hme-lockup.patch
|
||||
+ powerpc-g4-l2-flush-errata.patch
|
||||
+ tty-locking-fixes9.patch
|
||||
|
|
@ -1 +0,0 @@
|
|||
+ patch-2.6.12.4
|
||||
|
|
@ -1 +0,0 @@
|
|||
+ patch-2.6.12.5
|
||||
|
|
@ -6,7 +6,7 @@ SHELL := sh -e
|
|||
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
|
||||
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||
srcver := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
|
||||
VERSION := $(word 1,$(subst -, ,$(srcver)))
|
||||
VERSION := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
|
||||
MAJOR := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
|
||||
|
||||
include debian/rules.defs
|
||||
|
|
@ -38,6 +38,9 @@ orig: ../orig/linux-$(MAJOR)-$(VERSION)
|
|||
exit 1; \
|
||||
fi
|
||||
|
||||
maintainerclean:
|
||||
rm -rf $(filter-out debian, $(wildcard *))
|
||||
|
||||
clean: unpatch
|
||||
dh_testdir
|
||||
rm -f version.Debian
|
||||
|
|
|
|||
Loading…
Reference in New Issue