Linux 2.6.22.5
Subsystems (10)
We (the -stable team) are announcing the release of the 2.6.22.5 kernel. It contains a number of bugfixes and all users of the 2.6.22 series are encouraged to upgrade to it.
I'll also be replying to this message with a copy of the patch between 2.6.22.4 and 2.6.22.5
The updated 2.6.22.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=summarythanks,
greg k-h
--------
Documentation/kernel-parameters.txt | 5 -- Makefile | 2 arch/i386/Makefile | 4 - arch/i386/kernel/Makefile | 1 arch/i386/kernel/cpu/perfctr-watchdog.c | 4 + arch/i386/kernel/doublefault.c | 13 +++--- arch/i386/kernel/legacy_serial.c | 67 -------------------------------- arch/i386/kernel/sysenter.c | 4 + arch/x86_64/Makefile | 4 - arch/x86_64/kernel/Makefile | 2 arch/x86_64/kernel/head.S | 3 - drivers/acpi/events/evgpeblk.c | 4 + drivers/acpi/tables/tbfadt.c | 44 ++++++++++++--------- drivers/ata/ahci.c | 5 +- drivers/hwmon/smsc47m1.c | 2 drivers/hwmon/w83781d.c | 4 - drivers/net/forcedeth.c | 10 ++-- drivers/net/r8169.c | 18 ++++---- drivers/net/sky2.c | 49 ++++++++++++++--------- drivers/serial/Kconfig | 14 ++---- fs/jffs2/write.c | 3 + include/asm-avr32/atomic.h | 4 - include/asm-i386/serial.h | 16 +++++++ include/asm-x86_64/serial.h | 16 +++++++ kernel/power/snapshot.c | 3 - 25 files changed, 146 insertions(+), 155 deletions(-)
Summary of changes from v2.6.22.4 to v2.6.22.5
==============================================
Andi Kleen (3):
x86_64: Check for .cfi_rel_offset in CFI probe
x86_64: Change PMDS invocation to single macro
i386: Handle P6s without performance counters in nmi watchdog
Andrew Morton (1):
revert "x86, serial: convert legacy COM ports to platform devices"
Bob Moore (2):
ACPICA: Fixed possible corruption of global GPE list
ACPICA: Clear reserved fields for incoming ACPI 1.0 FADTs
Chuck Ebbert (1):
i386: Fix double fault handler
David Woodhouse (1):
JFFS2 locking regression fix.
Francois Romieu (1):
r8169: avoid needless NAPI poll scheduling
Greg Kroah-Hartman (1):
Linux 2.6.22.5
Haavard Skinnemoen (1):
AVR32: Fix atomic_add_unless() and atomic_sub_unless()
Jan Beulich (1):
i386: allow debuggers to access the vsyscall page with compat vDSO
Jean Delvare (1):
hwmon: (smsc47m1) restore missing name attribute
Mark M. Hoffman (1):
hwmon: fix w83781d temp sensor type setting
Rafael J. Wysocki (1):
Hibernation: do not try to mark invalid PFNs as nosave
Stephen Hemminger (4):
sky2: restore workarounds for lost interrupts
sky2: carrier management
sky2: check for more work before leaving NAPI
sky2: check drop truncated packets
Timo Jantunen (1):
forcedeth: fix random hang in forcedeth driver when using netconsole
su henry (1):
libata: add ATI SB700 device IDs to AHCI driver
Documentation/kernel-parameters.txt +0 -5
@@ -850,11 +850,6 @@ and is between 256 and 4096 characters. It is defined in the file lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip Format: addr:<io>,irq:<irq> - legacy_serial.force [HW,IA-32,X86-64] - Probe for COM ports at legacy addresses even - if PNPBIOS or ACPI should describe them. This - is for working around firmware defects. - llsc*= [IA64] See function print_params() in arch/ia64/sn/kernel/llsc4.c.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 22 -EXTRAVERSION = .4 +EXTRAVERSION = .5 NAME = Holy Dancing Manatees, Batman! # *DOCUMENTATION*
arch/i386/Makefile +2 -2
@@ -51,8 +51,8 @@ cflags-y += -maccumulate-outgoing-args CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;) # do binutils support CFI? -cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) -AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) +cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) +AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) # is .cfi_signal_frame supported too? cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
arch/i386/kernel/Makefile +0 -1
@@ -35,7 +35,6 @@ obj-y += sysenter.o vsyscall.o obj-$(CONFIG_ACPI_SRAT) += srat.o obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o -obj-$(CONFIG_SERIAL_8250) += legacy_serial.o obj-$(CONFIG_VM86) += vm86.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_HPET_TIMER) += hpet.o
arch/i386/kernel/cpu/perfctr-watchdog.c +3 -1
@@ -346,7 +346,9 @@ static int setup_p6_watchdog(unsigned nmi_hz) perfctr_msr =MSR_P6_PERFCTR0 ; evntsel_msr =MSR_P6_EVNTSEL0 ; -wrmsrl (perfctr_msr,0UL ); +/* KVM doesn't implement this MSR */ +if (wrmsr_safe (perfctr_msr,0 ,0 ) <0 ) +return 0 ; evntsel =P6_EVNTSEL_INT |P6_EVNTSEL_OS
arch/i386/kernel/doublefault.c +7 -6
@@ -13,7 +13,7 @@static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE ];#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE) -#define ptr_ok (x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + 0x1000000) +#define ptr_ok (x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)static void doublefault_fn (void ) {
@@ -23,23 +23,23 @@ static void doublefault_fn(void)store_gdt (&gdt_desc); gdt = gdt_desc.address; -printk ("double fault, gdt at %08lx [%d bytes]\n" , gdt, gdt_desc.size); +printk (KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n" , gdt, gdt_desc.size);if (ptr_ok (gdt)) { gdt +=GDT_ENTRY_TSS <<3 ; tss = *(u16 *)(gdt+2 ); tss += *(u8 *)(gdt+4 ) <<16 ; tss += *(u8 *)(gdt+7 ) <<24 ; -printk ("double fault, tss at %08lx\n" , tss); +printk (KERN_EMERG "double fault, tss at %08lx\n" , tss);if (ptr_ok (tss)) {struct i386_hw_tss *t = (struct i386_hw_tss *)tss; -printk ("eip = %08lx, esp = %08lx\n" , t->eip, t->esp); +printk (KERN_EMERG "eip = %08lx, esp = %08lx\n" , t->eip, t->esp); -printk ("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n" , +printk (KERN_EMERG "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n" , t->eax, t->ebx, t->ecx, t->edx); -printk ("esi = %08lx, edi = %08lx\n" , +printk (KERN_EMERG "esi = %08lx, edi = %08lx\n" , t->esi, t->edi); } }
@@ -63,6 +63,7 @@ struct tss_struct doublefault_tss __cacheline_aligned = { .cs = __KERNEL_CS, .ss = __KERNEL_DS, .ds = __USER_DS, + .fs = __KERNEL_PERCPU, .__cr3 =__pa (swapper_pg_dir) }
arch/i386/kernel/legacy_serial.c deleted +0 -67
67 lines not on this page · raw message
arch/i386/kernel/sysenter.c +3 -1
@@ -336,7 +336,9 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)int in_gate_area (struct task_struct *task,unsigned long addr) { -return 0 ; +const struct vm_area_struct *vma =get_gate_vma (task); + +return vma && addr >= vma->vm_start && addr < vma->vm_end; }int in_gate_area_no_task (unsigned long addr)
arch/x86_64/Makefile +2 -2
@@ -57,8 +57,8 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) cflags-y += -maccumulate-outgoing-args # do binutils support CFI? -cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) -AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) +cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) +AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) # is .cfi_signal_frame supported too? cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
arch/x86_64/kernel/Makefile +0 -2
@@ -32,7 +32,6 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o -obj-$(CONFIG_SERIAL_8250) += legacy_serial.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o obj-$(CONFIG_X86_VSMP) += vsmp.o
@@ -50,7 +49,6 @@ CFLAGS_vsyscall.o := $(PROFILING) -g0 therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o bootflag-y += ../../i386/kernel/bootflag.o -legacy_serial-y += ../../i386/kernel/legacy_serial.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o topology-y += ../../i386/kernel/topology.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o
arch/x86_64/kernel/head.S +1 -2
@@ -326,8 +326,7 @@ NEXT_PAGE(level2_kernel_pgt) /* 40MB kernel mapping. The kernel code cannot be bigger than that. When you change this change KERNEL_TEXT_SIZE in page.h too. */ /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */ - PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, - KERNEL_TEXT_SIZE/PMD_SIZE) + PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, KERNEL_TEXT_SIZE/PMD_SIZE) /* Module mapping starts here */ .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0
drivers/acpi/events/evgpeblk.c +4 -0
@@ -586,6 +586,10 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt) flags =acpi_os_acquire_lock (acpi_gbl_gpe_lock);if (gpe_xrupt->previous) { gpe_xrupt->previous->next = gpe_xrupt->next; + }else { +/* No previous, update list head */ + + acpi_gbl_gpe_xrupt_list_head = gpe_xrupt->next; }if (gpe_xrupt->next) {
drivers/acpi/tables/tbfadt.c +26 -18
83 lines not on this page · raw message
drivers/ata/ahci.c +4 -1
@@ -399,7 +399,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {/* ATI */ { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */ - { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 */ + { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 IDE */ + { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700 AHCI */ + { PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700 nraid5 */ + { PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700 raid5 *//* VIA */ { PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */
drivers/hwmon/smsc47m1.c +2 -0
@@ -585,6 +585,8 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)if ((err =device_create_file (dev, &dev_attr_alarms))) goto error_remove_files; +if ((err =device_create_file (dev, &dev_attr_name))) + goto error_remove_files; data->class_dev =hwmon_device_register (dev);if (IS_ERR (data->class_dev)) {
drivers/hwmon/w83781d.c +2 -2
@@ -740,9 +740,9 @@ store_sensor(struct device *dev, struct device_attribute *da, static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR, show_sensor, store_sensor, 0); static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR, - show_sensor, store_sensor, 0); + show_sensor, store_sensor, 1); static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR, - show_sensor, store_sensor, 0); + show_sensor, store_sensor, 2);/* I2C devices get this name attribute automatically, but for ISA devices we must create it by ourselves. */
drivers/net/forcedeth.c +5 -5
@@ -3067,8 +3067,8 @@ static irqreturn_t nv_nic_irq(int foo, void *data) np->nic_poll_irq = np->irqmask;mod_timer (&np->nic_poll, jiffies +POLL_WAIT ); } -printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n" , dev->name, i);spin_unlock (&np->lock); +printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n" , dev->name, i);break ; }
@@ -3185,8 +3185,8 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) np->nic_poll_irq = np->irqmask;mod_timer (&np->nic_poll, jiffies +POLL_WAIT ); } -printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n" , dev->name, i);spin_unlock (&np->lock); +printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n" , dev->name, i);break ; }
@@ -3232,8 +3232,8 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data) np->nic_poll_irq |=NVREG_IRQ_TX_ALL ;mod_timer (&np->nic_poll, jiffies +POLL_WAIT ); } -printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n" , dev->name, i);spin_unlock_irqrestore (&np->lock, flags); +printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n" , dev->name, i);break ; }
@@ -3347,8 +3347,8 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data) np->nic_poll_irq |=NVREG_IRQ_RX_ALL ;mod_timer (&np->nic_poll, jiffies +POLL_WAIT ); } -printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n" , dev->name, i);spin_unlock_irqrestore (&np->lock, flags); +printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n" , dev->name, i);break ; } }
@@ -3420,8 +3420,8 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data) np->nic_poll_irq |=NVREG_IRQ_OTHER ;mod_timer (&np->nic_poll, jiffies +POLL_WAIT ); } -printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n" , dev->name, i);spin_unlock_irqrestore (&np->lock, flags); +printk (KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n" , dev->name, i);break ; }
drivers/net/r8169.c +10 -8
@@ -2649,14 +2649,16 @@ rtl8169_interrupt(int irq, void *dev_instance)rtl8169_check_link_status (dev, tp, ioaddr);#ifdef CONFIG_R8169_NAPI -RTL_W16 (IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event); - tp->intr_mask = ~rtl8169_napi_event; - -if (likely (netif_rx_schedule_prep (dev))) -__netif_rx_schedule (dev); -else if (netif_msg_intr (tp)) { -printk (KERN_INFO "%s: interrupt %04x taken in poll\n" , - dev->name, status); +if (status & rtl8169_napi_event) { +RTL_W16 (IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event); + tp->intr_mask = ~rtl8169_napi_event; + +if (likely (netif_rx_schedule_prep (dev))) +__netif_rx_schedule (dev); +else if (netif_msg_intr (tp)) { +printk (KERN_INFO "%s: interrupt %04x in poll\n" , + dev->name, status); + } }break ;#else
drivers/net/sky2.c +30 -19
118 lines not on this page · raw message
drivers/serial/Kconfig +5 -9
@@ -74,21 +74,17 @@ config SERIAL_8250_PCI depends on SERIAL_8250 && PCI default SERIAL_8250 help - Say Y here if you have PCI serial ports. - - To compile this driver as a module, choose M here: the module - will be called 8250_pci. + This builds standard PCI serial support. You may be able to + disable this feature if you only need legacy serial support. + Saves about 9K. config SERIAL_8250_PNP tristate "8250/16550 PNP device support" if EMBEDDED depends on SERIAL_8250 && PNP default SERIAL_8250 help - Say Y here if you have serial ports described by PNPBIOS or ACPI. - These are typically ports built into the system board. - - To compile this driver as a module, choose M here: the module - will be called 8250_pnp. + This builds standard PNP serial support. You may be able to + disable this feature if you only need legacy serial support. config SERIAL_8250_HP300 tristate
fs/jffs2/write.c +3 -0
@@ -553,6 +553,9 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,struct jffs2_full_dirent **prev = &dir_f->dents;uint32_t nhash =full_name_hash (name, namelen); +/* We don't actually want to reserve any space, but we do +want to be holding the alloc_sem when we write to flash */ +down (&c->alloc_sem);down (&dir_f->sem);while ((*prev) && (*prev)->nhash <= nhash) {
include/asm-avr32/atomic.h +2 -2
@@ -101,7 +101,7 @@ static inline int atomic_sub_unless(atomic_t *v, int a, int u)" mov %1, 1\n" "1:" : "=&r"(tmp), "=&r"(result), "=o"(v->counter) - : "m"(v->counter), "rKs21"(a), "rKs21"(u) + : "m"(v->counter), "rKs21"(a), "rKs21"(u), "1"(result) : "cc", "memory"); return result;
@@ -137,7 +137,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) " mov %1, 1\n" "1:" : "=&r"(tmp), "=&r"(result), "=o"(v->counter) - : "m"(v->counter), "r"(a), "ir"(u) + : "m"(v->counter), "r"(a), "ir"(u), "1"(result) : "cc", "memory"); }
include/asm-i386/serial.h +16 -0
@@ -11,3 +11,19 @@* megabits/second; but this requires the faster clock. */ #define BASE_BAUD ( 1843200 / 16 ) + +/* Standard COM flags (except for COM4, because of the 8514 problem) */ +#ifdef CONFIG_SERIAL_DETECT_IRQ +#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) +#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#else +#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) +#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#endif + +#define SERIAL_PORT_DFNS \ +/* UART CLK PORT IRQ FLAGS */ \ + { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },/* ttyS0 */ \ + { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ + { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ + { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
include/asm-x86_64/serial.h +16 -0
@@ -11,3 +11,19 @@* megabits/second; but this requires the faster clock. */ #define BASE_BAUD ( 1843200 / 16 ) + +/* Standard COM flags (except for COM4, because of the 8514 problem) */ +#ifdef CONFIG_SERIAL_DETECT_IRQ +#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) +#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) +#else +#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) +#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF +#endif + +#define SERIAL_PORT_DFNS \ +/* UART CLK PORT IRQ FLAGS */ \ + { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },/* ttyS0 */ \ + { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ + { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ + { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
kernel/power/snapshot.c +2 -1
@@ -709,7 +709,8 @@ static void mark_nosave_pages(struct memory_bitmap *bm) region->end_pfn << PAGE_SHIFT);for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++) -memory_bm_set_bit (bm, pfn); +if (pfn_valid (pfn)) +memory_bm_set_bit (bm, pfn); } }