Author: maks
Date: Wed Jan 23 22:12:15 2008
New Revision: 10175
Log:
update to patch-2.6.24-rc8-git6
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git6
- copied, changed from r10171,
/dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git5
Removed:
dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git5
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git6
(from r10171,
/dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git5)
==============================================================================
--- /dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git5
(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/patch-2.6.24-rc8-git6
Wed Jan 23 22:12:15 2008
@@ -48,6 +48,21 @@
method, it is your driver's responsibility to free up the SKB
and in some finite amount of time.
+diff --git a/Documentation/networking/wavelan.txt
b/Documentation/networking/wavelan.txt
+index c1acf5e..afa6e52 100644
+--- a/Documentation/networking/wavelan.txt
++++ b/Documentation/networking/wavelan.txt
+@@ -12,8 +12,8 @@ and many Linux driver to support it.
+ "wavelan" driver (old ISA Wavelan)
+ ----------------
+ o Config : Network device -> Wireless LAN -> AT&T WaveLAN
+- o Location : .../drivers/net/wavelan*
+- o in-line doc : .../drivers/net/wavelan.p.h
++ o Location : .../drivers/net/wireless/wavelan*
++ o in-line doc : .../drivers/net/wireless/wavelan.p.h
+ o on-line doc :
+ http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html
+
diff --git a/Documentation/watchdog/watchdog-api.txt
b/Documentation/watchdog/watchdog-api.txt
index bb7cb1d..4cc4ba9 100644
--- a/Documentation/watchdog/watchdog-api.txt
@@ -98,9 +113,18 @@
The ioctl API:
diff --git a/Makefile b/Makefile
-index 713f685..a22cac5 100644
+index 713f685..cfe6d28 100644
--- a/Makefile
+++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 24
+-EXTRAVERSION = -rc8
++EXTRAVERSION = -rc8-git6
+ NAME = Arr Matey! A Hairy Bilge Rat!
+
+ # *DOCUMENTATION*
@@ -12,7 +12,7 @@ NAME = Arr Matey! A Hairy Bilge Rat!
# Do not:
@@ -400,6 +424,19 @@
struct platform_device *pdev;
if (!(tx4938_ccfgptr->pcfg &
(i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))
+diff --git a/arch/powerpc/boot/flatdevtree_env.h
b/arch/powerpc/boot/flatdevtree_env.h
+index ad0420d..66e0ebb 100644
+--- a/arch/powerpc/boot/flatdevtree_env.h
++++ b/arch/powerpc/boot/flatdevtree_env.h
+@@ -2,7 +2,7 @@
+ * This file adds the header file glue so that the shared files
+ * flatdevicetree.[ch] can compile and work in the powerpc bootwrapper.
+ *
+- * strncmp & strchr copied from <file:lib/strings.c>
++ * strncmp & strchr copied from <file:lib/string.c>
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ *
+ * Maintained by: Mark A. Greer <[EMAIL PROTECTED]>
diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S
b/arch/sparc64/kernel/sun4v_tlb_miss.S
index 9871dbb..fd94305 100644
--- a/arch/sparc64/kernel/sun4v_tlb_miss.S
@@ -442,6 +479,127 @@
printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
"pte[%lx] error[%lx]\n",
sun4v_err_dtlb_vaddr, sun4v_err_dtlb_ctx,
+diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
+index c3a565b..a6b1490 100644
+--- a/arch/x86/kernel/io_apic_32.c
++++ b/arch/x86/kernel/io_apic_32.c
+@@ -2169,14 +2169,10 @@ static inline void __init check_timer(void)
+ {
+ int apic1, pin1, apic2, pin2;
+ int vector;
+- unsigned int ver;
+ unsigned long flags;
+
+ local_irq_save(flags);
+
+- ver = apic_read(APIC_LVR);
+- ver = GET_APIC_VERSION(ver);
+-
+ /*
+ * get/set the timer IRQ vector:
+ */
+@@ -2189,15 +2185,11 @@ static inline void __init check_timer(void)
+ * mode for the 8259A whenever interrupts are routed
+ * through I/O APICs. Also IRQ0 has to be enabled in
+ * the 8259A which implies the virtual wire has to be
+- * disabled in the local APIC. Finally timer interrupts
+- * need to be acknowledged manually in the 8259A for
+- * timer_interrupt() and for the i82489DX when using
+- * the NMI watchdog.
++ * disabled in the local APIC.
+ */
+ apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);
+ init_8259A(1);
+- timer_ack = !cpu_has_tsc;
+- timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver));
++ timer_ack = 1;
+ if (timer_over_8254 > 0)
+ enable_8259A_irq(0);
+
+diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
+index 0ab680f..3960ab7 100644
+--- a/arch/x86/kernel/mfgpt_32.c
++++ b/arch/x86/kernel/mfgpt_32.c
+@@ -278,12 +278,12 @@ static int mfgpt_next_event(unsigned long delta, struct
clock_event_device *evt)
+
+ static irqreturn_t mfgpt_tick(int irq, void *dev_id)
+ {
++ /* Turn off the clock (and clear the event) */
++ mfgpt_disable_timer(mfgpt_event_clock);
++
+ if (mfgpt_tick_mode == CLOCK_EVT_MODE_SHUTDOWN)
+ return IRQ_HANDLED;
+
+- /* Turn off the clock */
+- mfgpt_disable_timer(mfgpt_event_clock);
+-
+ /* Clear the counter */
+ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
+
+@@ -319,10 +319,6 @@ static int __init mfgpt_timer_setup(void)
+ }
+
+ mfgpt_event_clock = timer;
+- /* Set the clock scale and enable the event mode for CMP2 */
+- val = MFGPT_SCALE | (3 << 8);
+-
+- geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP, val);
+
+ /* Set up the IRQ on the MFGPT side */
+ if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, irq)) {
+@@ -339,6 +335,11 @@ static int __init mfgpt_timer_setup(void)
+ goto err;
+ }
+
++ /* Set the clock scale and enable the event mode for CMP2 */
++ val = MFGPT_SCALE | (3 << 8);
++
++ geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP, val);
++
+ /* Set up the clock event */
+ mfgpt_clockevent.mult = div_sc(MFGPT_HZ, NSEC_PER_SEC, 32);
+ mfgpt_clockevent.min_delta_ns = clockevent_delta2ns(0xF,
+diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
+index 80ca72e..852db29 100644
+--- a/arch/x86/kernel/nmi_32.c
++++ b/arch/x86/kernel/nmi_32.c
+@@ -25,7 +25,6 @@
+
+ #include <asm/smp.h>
+ #include <asm/nmi.h>
+-#include <asm/timer.h>
+
+ #include "mach_traps.h"
+
+@@ -84,7 +83,7 @@ static int __init check_nmi_watchdog(void)
+
+ prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);
+ if (!prev_nmi_count)
+- goto error;
++ return -1;
+
+ printk(KERN_INFO "Testing NMI watchdog ... ");
+
+@@ -119,7 +118,7 @@ static int __init check_nmi_watchdog(void)
+ if (!atomic_read(&nmi_active)) {
+ kfree(prev_nmi_count);
+ atomic_set(&nmi_active, -1);
+- goto error;
++ return -1;
+ }
+ printk("OK.\n");
+
+@@ -130,10 +129,6 @@ static int __init check_nmi_watchdog(void)
+
+ kfree(prev_nmi_count);
+ return 0;
+-error:
+- timer_ack = !cpu_has_tsc;
+-
+- return -1;
+ }
+ /* This needs to happen later in boot so counters are working */
+ late_initcall(check_nmi_watchdog);
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index c88bbff..02d1e1e 100644
--- a/arch/x86/kernel/traps_32.c
@@ -542,6 +700,19 @@
{
unsigned char mri;
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index ef1ed5d..2e3a0d4 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -137,7 +137,7 @@ config CYCLADES
+ your Linux box, for instance in order to become a dial-in server.
+
+ For information about the Cyclades-Z card, read
+- <file:drivers/char/README.cycladesZ>.
++ <file:Documentation/README.cycladesZ>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called cyclades.
diff --git a/drivers/cpufreq/cpufreq_conservative.c
b/drivers/cpufreq/cpufreq_conservative.c
index 1bba997..5d3a04b 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
@@ -585,6 +756,86 @@
+module_init(cpufreq_gov_userspace_init);
+#endif
module_exit(cpufreq_gov_userspace_exit);
+diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
+index 6a182e1..ad6c8a3 100644
+--- a/drivers/hwmon/it87.c
++++ b/drivers/hwmon/it87.c
+@@ -2,6 +2,14 @@
+ it87.c - Part of lm_sensors, Linux kernel modules for hardware
+ monitoring.
+
++ The IT8705F is an LPC-based Super I/O part that contains UARTs, a
++ parallel port, an IR port, a MIDI port, a floppy controller, etc., in
++ addition to an Environment Controller (Enhanced Hardware Monitor and
++ Fan Controller)
++
++ This driver supports only the Environment Controller in the IT8705F and
++ similar parts. The other devices are supported by different drivers.
++
+ Supports: IT8705F Super I/O chip w/LPC interface
+ IT8712F Super I/O chip w/LPC interface
+ IT8716F Super I/O chip w/LPC interface
+@@ -118,9 +126,15 @@ static int fix_pwm_polarity;
+ /* Length of ISA address segment */
+ #define IT87_EXTENT 8
+
+-/* Where are the ISA address/data registers relative to the base address */
+-#define IT87_ADDR_REG_OFFSET 5
+-#define IT87_DATA_REG_OFFSET 6
++/* Length of ISA address segment for Environmental Controller */
++#define IT87_EC_EXTENT 2
++
++/* Offset of EC registers from ISA base address */
++#define IT87_EC_OFFSET 5
++
++/* Where are the ISA address/data registers relative to the EC base address */
++#define IT87_ADDR_REG_OFFSET 0
++#define IT87_DATA_REG_OFFSET 1
+
+ /*----- The IT87 registers -----*/
+
+@@ -968,10 +982,10 @@ static int __devinit it87_probe(struct platform_device
*pdev)
+ };
+
+ res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+- if (!request_region(res->start, IT87_EXTENT, DRVNAME)) {
++ if (!request_region(res->start, IT87_EC_EXTENT, DRVNAME)) {
+ dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
+ (unsigned long)res->start,
+- (unsigned long)(res->start + IT87_EXTENT - 1));
++ (unsigned long)(res->start + IT87_EC_EXTENT - 1));
+ err = -EBUSY;
+ goto ERROR0;
+ }
+@@ -1124,7 +1138,7 @@ ERROR2:
+ platform_set_drvdata(pdev, NULL);
+ kfree(data);
+ ERROR1:
+- release_region(res->start, IT87_EXTENT);
++ release_region(res->start, IT87_EC_EXTENT);
+ ERROR0:
+ return err;
+ }
+@@ -1137,7 +1151,7 @@ static int __devexit it87_remove(struct platform_device
*pdev)
+ sysfs_remove_group(&pdev->dev.kobj, &it87_group);
+ sysfs_remove_group(&pdev->dev.kobj, &it87_group_opt);
+
+- release_region(data->addr, IT87_EXTENT);
++ release_region(data->addr, IT87_EC_EXTENT);
+ platform_set_drvdata(pdev, NULL);
+ kfree(data);
+
+@@ -1402,8 +1416,8 @@ static int __init it87_device_add(unsigned short address,
+ const struct it87_sio_data *sio_data)
+ {
+ struct resource res = {
+- .start = address ,
+- .end = address + IT87_EXTENT - 1,
++ .start = address + IT87_EC_OFFSET,
++ .end = address + IT87_EC_OFFSET + IT87_EC_EXTENT - 1,
+ .name = DRVNAME,
+ .flags = IORESOURCE_IO,
+ };
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c
b/drivers/infiniband/hw/ipath/ipath_ud.c
index 16a2a93..b3df6f3 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -1028,7 +1279,7 @@
outw(dev->if_port == 3 ? StartCoax : StopCoax,
ioaddr + EL3_CMD);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index 114771a..9ae3166 100644
+index 114771a..9af05a2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1976,9 +1976,6 @@ config E1000E
@@ -1041,6 +1292,16 @@
To compile this driver as a module, choose M here. The module
will be called e1000e.
+@@ -2468,9 +2465,6 @@ config IXGBE
+
+ <http://support.intel.com>
+
+- More specific information on configuring the driver is in
+- <file:Documentation/networking/ixgbe.txt>.
+-
+ To compile this driver as a module, choose M here. The module
+ will be called ixgbe.
+
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 35b0a7d..9200ee5 100644
--- a/drivers/net/atl1/atl1_main.c
@@ -3036,6 +3297,19 @@
};
/* fields in frame header */
+diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
+index c98fc62..2c08c0a 100644
+--- a/drivers/net/wireless/Kconfig
++++ b/drivers/net/wireless/Kconfig
+@@ -68,7 +68,7 @@ config WAVELAN
+ <http://www.tldp.org/docs.html#howto>. Some more specific
+ information is contained in
+ <file:Documentation/networking/wavelan.txt> and in the source code
+- <file:drivers/net/wavelan.p.h>.
++ <file:drivers/net/wireless/wavelan.p.h>.
+
+ You will also need the wireless tools package available from
+ <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
diff --git a/drivers/net/wireless/b43/rfkill.c
b/drivers/net/wireless/b43/rfkill.c
index 98cf70c..11f53cb 100644
--- a/drivers/net/wireless/b43/rfkill.c
@@ -3188,6 +3462,19 @@
}
}
+diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
+index a6676be..184c7ae 100644
+--- a/drivers/scsi/Kconfig
++++ b/drivers/scsi/Kconfig
+@@ -732,7 +732,7 @@ config SCSI_GDTH
+ This is a driver for RAID/SCSI Disk Array Controllers (EISA/ISA/PCI)
+ manufactured by Intel Corporation/ICP vortex GmbH. It is documented
+ in the kernel source in <file:drivers/scsi/gdth.c> and
+- <file:drivers/scsi/gdth.h.>
++ <file:drivers/scsi/gdth.h>.
+
+ To compile this driver as a module, choose M here: the
+ module will be called gdth.
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index feba967..7c069a0 100644
--- a/drivers/usb/serial/keyspan.c
@@ -3229,6 +3516,28 @@
/* activate this new configuration */
+diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
+index 4318935..112f4ec 100644
+--- a/drivers/w1/slaves/w1_therm.c
++++ b/drivers/w1/slaves/w1_therm.c
+@@ -112,7 +112,7 @@ static struct w1_therm_family_converter
w1_therm_families[] = {
+
+ static inline int w1_DS18B20_convert_temp(u8 rom[9])
+ {
+- int t = (rom[1] << 8) | rom[0];
++ s16 t = (rom[1] << 8) | rom[0];
+ t /= 16;
+ return t;
+ }
+@@ -204,7 +204,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,
+
+ crc = w1_calc_crc8(rom, 8);
+
+- if (rom[8] == crc && rom[0])
++ if (rom[8] == crc)
+ verdict = 1;
+ }
+ }
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 6ea125e..c622a0e 100644
--- a/drivers/watchdog/w83697hf_wdt.c
@@ -3245,6 +3554,21 @@
}
} else {
if (!w83697hf_check_wdt())
+diff --git a/fs/Kconfig b/fs/Kconfig
+index 487236c..781b47d 100644
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -1112,8 +1112,8 @@ config HFS_FS
+ help
+ If you say Y here, you will be able to mount Macintosh-formatted
+ floppy disks and hard drive partitions with full read-write access.
+- Please read <file:fs/hfs/HFS.txt> to learn about the available mount
+- options.
++ Please read <file:Documentation/filesystems/hfs.txt> to learn about
++ the available mount options.
+
+ To compile this file system support as a module, choose M here: the
+ module will be called hfs.
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 31284c7..110dd35 100644
--- a/fs/hfs/btree.c
@@ -3529,6 +3853,38 @@
out_restore:
raw_local_irq_restore(flags);
+diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
+index a66d4d1..f2c1a04 100644
+--- a/kernel/rcupdate.c
++++ b/kernel/rcupdate.c
+@@ -549,7 +549,7 @@ static void rcu_init_percpu_data(int cpu, struct
rcu_ctrlblk *rcp,
+ rdp->blimit = blimit;
+ }
+
+-static void __devinit rcu_online_cpu(int cpu)
++static void __cpuinit rcu_online_cpu(int cpu)
+ {
+ struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
+ struct rcu_data *bh_rdp = &per_cpu(rcu_bh_data, cpu);
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 37cf07a..e76b11c 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -7153,6 +7153,14 @@ int sched_group_set_shares(struct task_group *tg,
unsigned long shares)
+ {
+ int i;
+
++ /*
++ * A weight of 0 or 1 can cause arithmetics problems.
++ * (The default weight is 1024 - so there's no practical
++ * limitation from this.)
++ */
++ if (shares < 2)
++ shares = 2;
++
+ spin_lock(&tg->lock);
+ if (tg->shares == shares)
+ goto done;
diff --git a/kernel/timer.c b/kernel/timer.c
index 26671f4..2a00c22 100644
--- a/kernel/timer.c
@@ -4064,3 +4420,25 @@
if (!ss_initialized)
return 0;
+diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
+index af37cd0..857008b 100644
+--- a/sound/oss/Kconfig
++++ b/sound/oss/Kconfig
+@@ -75,7 +75,7 @@ config SOUND_TRIDENT
+
+
+ This driver differs slightly from OSS/Free, so PLEASE READ the
+- comments at the top of <file:drivers/sound/trident.c>.
++ comments at the top of <file:sound/oss/trident.c>.
+
+ config SOUND_MSNDCLAS
+ tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
+@@ -564,7 +564,7 @@ config SOUND_AEDSP16
+ questions.
+
+ Read the <file:Documentation/sound/oss/README.OSS> file and the head
of
+- <file:drivers/sound/aedsp16.c> as well as
++ <file:sound/oss/aedsp16.c> as well as
+ <file:Documentation/sound/oss/AudioExcelDSP16> to get more information
+ about this driver and its configuration.
+
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2 Wed Jan
23 22:12:15 2008
@@ -1,5 +1,5 @@
+ bugfix/arm/disable-ath5k.patch
-+ bugfix/all/patch-2.6.24-rc8-git5
++ bugfix/all/patch-2.6.24-rc8-git6
+ bugfix/all/fw-sbp2-incr-login-orb-reply-timeout.patch
+ bugfix/all/fw-sbp2-skip-unnecessary-logout.patch
+ bugfix/all/fw-sbp2-try-increase-reconnect_hold.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
