Linux 2.6.27.9
Subsystems (40)
We (the -stable team) are announcing the release of the 2.6.27.9 kernel.
It contains a wide range of bugfixes, and all users of the 2.6.27 kernel series are strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.27.8 and 2.6.27.9
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.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.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/powerpc/kernel/cpu_setup_44x.S | 1 arch/powerpc/kernel/cputable.c | 3 arch/powerpc/platforms/cell/smp.c | 10 - arch/powerpc/platforms/pseries/smp.c | 13 - arch/powerpc/sysdev/mpic.c | 9 arch/sparc/include/asm/uaccess_64.h | 4 arch/sparc64/kernel/pci.c | 10 - arch/sparc64/kernel/ptrace.c | 2 arch/sparc64/kernel/visemul.c | 6 arch/sparc64/lib/user_fixup.c | 2 arch/um/drivers/mconsole_kern.c | 4 arch/x86/kernel/hpet.c | 2 arch/x86/mm/init_64.c | 4 block/bsg.c | 2 block/scsi_ioctl.c | 2 drivers/acpi/osl.c | 36 --- drivers/acpi/sleep/main.c | 40 +++- drivers/ata/libata-sff.c | 13 + drivers/char/applicom.c | 6 drivers/edac/cell_edac.c | 3 drivers/hid/usbhid/hid-quirks.c | 2 drivers/input/serio/i8042-x86ia64io.h | 29 ++ drivers/net/cxgb3/adapter.h | 1 drivers/net/cxgb3/cxgb3_main.c | 5 drivers/net/cxgb3/sge.c | 56 +---- drivers/net/niu.c | 3 drivers/net/pppol2tp.c | 1 drivers/pci/pcie/aspm.c | 29 ++ drivers/pci/slot.c | 1 drivers/pnp/base.h | 2 drivers/pnp/quirks.c | 2 drivers/pnp/resource.c | 4 drivers/spi/spidev.c | 4 drivers/usb/serial/option.c | 176 +++++++++++++++-- drivers/usb/storage/unusual_devs.h | 334 +++++++++++++++++++++++++++++++--- drivers/watchdog/ib700wdt.c | 2 fs/binfmt_em86.c | 2 fs/binfmt_misc.c | 4 fs/binfmt_script.c | 5 fs/cifs/connect.c | 36 ++- fs/exec.c | 10 - fs/fcntl.c | 7 fs/ioctl.c | 12 - fs/jbd/checkpoint.c | 49 +++- fs/jbd/journal.c | 28 ++ fs/jbd/recovery.c | 7 fs/proc/task_mmu.c | 4 fs/xfs/xfs_rename.c | 2 include/linux/binfmts.h | 2 include/linux/blkdev.h | 1 include/linux/jbd.h | 2 include/linux/pnp.h | 6 kernel/fork.c | 15 - kernel/sched.c | 8 net/atm/svc.c | 6 net/ipv4/udp.c | 12 - net/ipv6/udp.c | 8 net/unix/af_unix.c | 2 sound/pci/emu10k1/emu10k1_main.c | 3 sound/pci/hda/hda_proc.c | 2 sound/pci/hda/patch_analog.c | 10 - sound/pci/hda/patch_realtek.c | 152 +++++++++++++++ sound/pci/hda/patch_sigmatel.c | 45 ++++ 64 files changed, 1022 insertions(+), 243 deletions(-)
Alan Cox (1):
applicom: Fix an unchecked user ioctl range and an error return
Alan Stern (3):
USB: storage: updates unusual_devs entry for the Nokia 6300
USB: storage: update unusual_devs entries for Nokia 5300 and 5310
USB: storage: unusual_devs entry for Mio C520-GPS
Alex Chiang (1):
PCI: stop leaking 'slot_name' in pci_create_slot
Arnd Bergmann (1):
powerpc/mpic: Don't reset affinity for secondary MPIC on boot
Balbir Singh (1):
uml: boot broken due to buffer overrun
Benjamin Herrenschmidt (1):
edac: fix enabling of polling cell module
Brian King (1):
sched: CPU remove deadlock fix
Chas Williams (1):
ATM: CVE-2008-5079: duplicate listen() on socket corrupts the vcc table
Chris Torek (1):
sparc64: Fix bug in PTRACE_SETFPREGS64 handling.
Clive Messer (1):
ALSA: hda - Fix another ALC889A (rev 0x100101)
Colin B Macdonald (1):
Input: i8042 - add Thinkpad R31 to nomux list
Dan Williams (2):
USB: option: add Ericsson F3507g and Dell 5530
USB: option: add Pantech cards
Dave Chinner (1):
XFS: Fix hang after disallowed rename across directory quota domains
David S. Miller (2):
niu: Fix readq implementation when architecture does not provide one.
sparc64: Fix offset calculation in compute_size()
Denis Joseph Barrow (1):
USB: option.c remove duplicate device ids now supported in hso.c
Divy Le Ray (2):
cxgb3 - fix race in EEH
cxgb3 - remove duplicate tests in lro
Dmitry Torokhov (1):
Input: i8042 - add Compal Hel80 laptop to nomux blacklist
Eric Dumazet (1):
udp: multicast packets need to check namespace
Frédéric Marchal (1):
USB: Unusual dev for Mio moov 330 gps
Frédéric Moulins (1):
pppol2tp: Add missing sock_put() in pppol2tp_release()
Gary Hade (1):
x86: remove debug code from arch_add_memory()
Grant Likely (1):
powerpc/virtex5: Fix Virtex5 machine check handling
Greg Kroah-Hartman (2):
USB: serial: add more Onda device ids to option driver Linux 2.6.27.9
Herton Ronaldo Krzesinski (1):
Input: i8042 - add Dell XPS M1530 to nomux list
Hidehiro Kawai (2):
jbd: fix error handling for checkpoint io
jbd: test BH_Write_EIO to detect errors on metadata buffers
Hong H. Pham (1):
sparc64: Sync FPU state in VIS emulation handler.
Hugh Dickins (2):
sparc64: Fix __copy_{to,from}_user_inatomic defines. fix mapping_writably_mapped()
Jeff Layton (1):
cifs: fix a regression in cifs umount codepath
Jens Taprogge (1):
USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera.
Jianjun Kong (1):
af_unix: netns: fix problem of return value
Jon K Hellan (1):
USB: Option / AnyData new modem, same ID
Jonathan Corbet (1):
Fix a race condition in FASYNC handling
Joseph Myers (1):
sparc64: Fix VIS emulation bugs
Kailang Yang (2):
ALSA: hda - Add ALC887 support
ALSA: hda - Add support of ALC272
Kirill A. Shutemov (1):
Allow recursion in binfmt_script and binfmt_misc
Len Brown (1):
ACPI: delete OSI(Linux) DMI dmesg spam
Leslie Watter (1):
USB: Add YISO u893 usb modem vendor and product IDs to option driver
Li Zefan (1):
sched: fix a bug in sched domain degenerate
Linus Torvalds (1):
Enforce a minimum SG_IO timeout
Matt Fleming (1):
x86: HPET: convert WARN_ON to WARN_ON_ONCE
Matt Mackall (1):
pagemap: fix 32-bit pagemap regression
Matthew Ranostay (1):
ALSA: hda: fixed hp_nid DAC for DELL_M6
Mauro Carvalho Chehab (1):
ALSA: hda: Add support for ECS/PC Chips boards with Sigmatel codecs
Max Dmitrichenko (1):
sparc64: Fix PCI resource mapping on sparc64
Michel Marti (1):
ALSA: hda - Add another HP model (6730s) for AD1884A
Mikhail Gusarov (1):
USB: add ZTE MF626 USB GSM modem entry
Milton Miller (1):
powerpc: Use cpu_thread_in_core in smp_init for of_spin_map
Pascal Terjan (1):
ALSA: hda - Fix sound on NEC Versa S9100
Paul Ready (1):
USB: add Nikon D300 camera to unusual_devs
Peter Korsgaard (2):
ALSA: hda: appletv support
atv: hid quirk for appletv IR receiver
Rafael J. Wysocki (1):
ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume
Rene Herman (1):
pnp: make the resource type an unsigned long
Ricky Wong (1):
USB: unusual devs patch for Nokia 7610 Supernova
Robin H. Johnson (3):
ALSA: HDA: hda_proc: Fix printf format specifier
ALSA: HDA: patch_analog: Fix SPDIF output on AD1989B
ALSA: HDA: patch_analog: Quirk for Asus P5Q Premium/Pro boards.
Roland McGrath (1):
tracehook: exec double-reporting fix
Shaohua Li (1):
x86, memory hotplug: remove wrong -1 in calling init_memory_mapping()
Stefan Bader (1):
Input: i8042 - add Blue FB5601 to noloop exception table
Takashi Iwai (9):
ALSA: hda - Fix ALC269 capture source
ALSA: hda - Restore default pin configs for realtek codecs
ALSA: hda - Add another HP model for AD1884A
ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)
ALSA: hda - Add a quirk for MEDION MD96630
ALSA: hda - Add a quirk for Dell Studio 15
ALSA: hda - No 'Headphone as Line-out' swich without line-outs
ALSA: hda - mark Dell studio 1535 quirk
ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy models
Tejun Heo (1):
libata: improve phantom device detection
Thomas Renninger (1):
PCIe: ASPM: Break out of endless loop waiting for PCI config bits to switch
Tobias Kunze Briseño (1):
USB: usb-storage: unusual_devs entry for Nikon D2H
Travis Place (2):
ALSA: hda - Add model for Toshiba L305 laptop
ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop
Wim Van Sebroeck (1):
ib700wdt.c - fix buffer_underflow bug
Wolfgang Ocker (1):
spi: avoid spidev crash when device is removed
fangxiaozhi (2):
USB: support Huawei data card product IDs
USB: unusual-devs: support Huawei data card product IDs
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .8 +EXTRAVERSION = .9 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/powerpc/kernel/cpu_setup_44x.S +1 -0
@@ -35,6 +35,7 @@ _GLOBAL(__setup_cpu_440grx) _GLOBAL(__setup_cpu_460ex) _GLOBAL(__setup_cpu_460gt) b __init_fpu_44x +_GLOBAL(__setup_cpu_440x5) _GLOBAL(__setup_cpu_440gx) _GLOBAL(__setup_cpu_440spe) b __fixup_440A_mcheck
arch/powerpc/kernel/cputable.c +3 -0
@@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);extern void __setup_cpu_440gx (unsigned long offset,struct cpu_spec * spec);extern void __setup_cpu_440grx (unsigned long offset,struct cpu_spec * spec);extern void __setup_cpu_440spe (unsigned long offset,struct cpu_spec * spec); +extern void __setup_cpu_440x5 (unsigned long offset,struct cpu_spec * spec);extern void __setup_cpu_460ex (unsigned long offset,struct cpu_spec * spec);extern void __setup_cpu_460gt (unsigned long offset,struct cpu_spec * spec);extern void __setup_cpu_603 (unsigned long offset,struct cpu_spec * spec);
@@ -1463,6 +1464,8 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_BOOKE, .icache_bsize = 32, .dcache_bsize = 32, + .cpu_setup = __setup_cpu_440x5, + .machine_check = machine_check_440A, .platform = "ppc440", }, {/* 460EX */
arch/powerpc/platforms/cell/smp.c +3 -7
@@ -54,8 +54,8 @@#endif /* -* The primary thread of each non-boot processor is recorded here before -* smp init. +* The Primary thread of each non-boot processor was started from the OF client +* interface by prom_hold_cpus and is spinning on secondary_hold_spinloop. */ static cpumask_t of_spin_map;
@@ -208,11 +208,7 @@ void __init smp_init_cell(void)/* Mark threads which are still spinning in hold loops. */ if (cpu_has_feature (CPU_FTR_SMT )) {for_each_present_cpu (i) { -if (i %2 ==0 ) -/* -* Even-numbered logical cpus correspond to -* primary threads. -*/ +if (cpu_thread_in_core (i) ==0 )cpu_set (i, of_spin_map); } }else {
arch/powerpc/platforms/pseries/smp.c +4 -9
@@ -52,8 +52,8 @@/* -* The primary thread of each non-boot processor is recorded here before -* smp init. +* The Primary thread of each non-boot processor was started from the OF client +* interface by prom_hold_cpus and is spinning on secondary_hold_spinloop. */ static cpumask_t of_spin_map;
@@ -191,8 +191,7 @@ static void __devinit smp_pSeries_kick_cpu(int nr)static int smp_pSeries_cpu_bootable (unsigned int nr) {/* Special case - we inhibit secondary thread startup -* during boot if the user requests it. Odd-numbered -* cpus are assumed to be secondary threads. +* during boot if the user requests it. */ if (system_state < SYSTEM_RUNNING && cpu_has_feature(CPU_FTR_SMT) &&
@@ -229,11 +228,7 @@ static void __init smp_init_pseries(void)/* Mark threads which are still spinning in hold loops. */ if (cpu_has_feature (CPU_FTR_SMT )) {for_each_present_cpu (i) { -if (i %2 ==0 ) -/* -* Even-numbered logical cpus correspond to -* primary threads. -*/ +if (cpu_thread_in_core (i) ==0 )cpu_set (i, of_spin_map); } }else {
arch/powerpc/sysdev/mpic.c +7 -2
@@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count)void __init mpic_init (struct mpic *mpic) {int i; +int cpu;BUG_ON (mpic->num_sources ==0 );
@@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic)mpic_pasemi_msi_init (mpic); +if (mpic->flags &MPIC_PRIMARY ) + cpu =hard_smp_processor_id (); +else + cpu =0 ; +for (i =0 ; i < mpic->num_sources; i++) {/* start with vector = source number, and masked */ u32 vecpri = MPIC_VECPRI_MASK | i |
@@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic)continue ;/* init hw */ mpic_irq_write (i,MPIC_INFO (IRQ_VECTOR_PRI ), vecpri); -mpic_irq_write (i,MPIC_INFO (IRQ_DESTINATION ), -1 <<hard_smp_processor_id ()); +mpic_irq_write (i,MPIC_INFO (IRQ_DESTINATION ),1 << cpu); }/* Init spurious vector */
arch/sparc/include/asm/uaccess_64.h +2 -2
@@ -265,8 +265,8 @@ extern long __strnlen_user(const char __user *, long len);#define strlen_user __strlen_user#define strnlen_user __strnlen_user -#define __copy_to_user_inatomic __copy_to_user -#define __copy_from_user_inatomic __copy_from_user +#define __copy_to_user_inatomic ___copy_to_user +#define __copy_from_user_inatomic ___copy_from_user#endif /* __ASSEMBLY__ */
arch/sparc64/kernel/pci.c +9 -1
@@ -1017,6 +1017,7 @@ static int __pci_mmap_make_offset(struct pci_dev *pdev,for (i =0 ; i <=PCI_ROM_RESOURCE ; i++) {struct resource *rp = &pdev->resource[i]; +resource_size_t aligned_end;/* Active? */ if (!rp->flags)
@@ -1034,8 +1035,15 @@ static int __pci_mmap_make_offset(struct pci_dev *pdev,continue ; } +/* Align the resource end to the next page address. +* PAGE_SIZE intentionally added instead of (PAGE_SIZE - 1), +* because actually we need the address of the next byte +* after rp->end. +*/ + aligned_end = (rp->end +PAGE_SIZE ) &PAGE_MASK ; +if ((rp->start <= user_paddr) && - (user_paddr + user_size) <= (rp->end +1UL )) + (user_paddr + user_size) <= aligned_end)break ; }
arch/sparc64/kernel/ptrace.c +1 -1
@@ -1014,7 +1014,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ;case PTRACE_SETFPREGS64 : - ret =copy_regset_to_user (child, view,REGSET_FP , + ret =copy_regset_from_user (child, view,REGSET_FP ,0 *sizeof (u64),33 *sizeof (u64), fps);
arch/sparc64/kernel/visemul.c +4 -2
@@ -131,7 +131,7 @@#define VIS_OPF_SHIFT 5#define VIS_OPF_MASK (0x1ff << VIS_OPF_SHIFT) -#define RS1 (INSN ) (((INSN) >> 24) & 0x1f) +#define RS1 (INSN ) (((INSN) >> 14) & 0x1f)#define RS2 (INSN ) (((INSN) >> 0) & 0x1f)#define RD (INSN ) (((INSN) >> 25) & 0x1f)
@@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn)unsigned long i; rs1 =fpd_regval (f,RS1 (insn)); - rs2 =fpd_regval (f,RS1 (insn)); + rs2 =fpd_regval (f,RS2 (insn)); rd =fpd_regaddr (f,RD (insn)); rd_val = *rd;
@@ -807,6 +807,8 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)if (get_user (insn, (u32 __user *) pc))return -EFAULT ; +save_and_clear_fpu (); + opf = (insn &VIS_OPF_MASK ) >>VIS_OPF_SHIFT ;switch (opf) {default :
arch/sparc64/lib/user_fixup.c +1 -1
@@ -24,7 +24,7 @@ static unsigned long compute_size(unsigned long start, unsigned long size, unsigif (fault_addr < start || fault_addr >= end) { *offset =0 ; }else { - *offset = start - fault_addr; + *offset = fault_addr - start; size = end - fault_addr; }return size;
arch/um/drivers/mconsole_kern.c +3 -1
@@ -16,6 +16,8 @@#include <linux/slab.h> #include <linux/syscalls.h> #include <linux/utsname.h> +#include <linux/socket.h> +#include <linux/un.h> #include <linux/workqueue.h> #include <linux/mutex.h> #include <asm/uaccess.h>
@@ -785,7 +787,7 @@ static int __init mconsole_init(void)/* long to avoid size mismatch warnings from gcc */ long sock;int err; -char file[256 ]; +char file[UNIX_PATH_MAX ];if (umid_file_name ("mconsole" , file,sizeof (file)))return -1 ;
arch/x86/kernel/hpet.c +1 -1
@@ -283,7 +283,7 @@ static int hpet_legacy_next_event(unsigned long delta,* what we wrote hit the chip before we compare it to the * counter. */ -WARN_ON ((u32 )hpet_readl (HPET_T0_CMP ) != cnt); +WARN_ON_ONCE ((u32 )hpet_readl (HPET_T0_CMP ) != cnt);return (s32)((u32 )hpet_readl (HPET_COUNTER ) - cnt) >=0 ? -ETIME :0 ; }
arch/x86/mm/init_64.c +2 -2
@@ -721,12 +721,12 @@ int arch_add_memory(int nid, u64 start, u64 size)unsigned long nr_pages = size >>PAGE_SHIFT ;int ret; - last_mapped_pfn =init_memory_mapping (start, start + size-1 ); + last_mapped_pfn =init_memory_mapping (start, start + size);if (last_mapped_pfn > max_pfn_mapped) max_pfn_mapped = last_mapped_pfn; ret =__add_pages (zone, start_pfn, nr_pages); -WARN_ON (1 ); +WARN_ON_ONCE (ret);return ret; }
block/bsg.c +2 -0
@@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, rq->timeout = q->sg_timeout;if (!rq->timeout) rq->timeout =BLK_DEFAULT_SG_TIMEOUT ; +if (rq->timeout <BLK_MIN_SG_TIMEOUT ) + rq->timeout =BLK_MIN_SG_TIMEOUT ;return 0 ; }
block/scsi_ioctl.c +2 -0
@@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, rq->timeout = q->sg_timeout;if (!rq->timeout) rq->timeout =BLK_DEFAULT_SG_TIMEOUT ; +if (rq->timeout <BLK_MIN_SG_TIMEOUT ) + rq->timeout =BLK_MIN_SG_TIMEOUT ;return 0 ; }
drivers/acpi/osl.c +0 -36
@@ -1261,34 +1261,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)return (AE_OK ); } -/** -* acpi_dmi_dump - dump DMI slots needed for blacklist entry -* -* Returns 0 on success -*/ -static int acpi_dmi_dump (void ) -{ - -if (!dmi_available) -return -1 ; - - printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n", - dmi_get_system_info(DMI_SYS_VENDOR)); - printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n", - dmi_get_system_info(DMI_PRODUCT_NAME)); - printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n", - dmi_get_system_info(DMI_PRODUCT_VERSION)); - printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n", - dmi_get_system_info(DMI_BOARD_NAME)); - printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n", - dmi_get_system_info(DMI_BIOS_VENDOR)); - printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n", - dmi_get_system_info(DMI_BIOS_DATE)); - -return 0 ; -} - -/****************************************************************************** * * FUNCTION: acpi_os_validate_interface
@@ -1315,14 +1287,6 @@ acpi_os_validate_interface (char *interface) osi_linux.cmdline ?" via cmdline" : osi_linux.dmi ? " via DMI" : ""); -if (!osi_linux.dmi) { -if (acpi_dmi_dump ()) - printk(KERN_NOTICE PREFIX -"[please extract dmidecode output]\n" ); - printk(KERN_NOTICE PREFIX -"Please send DMI info above to " - "[email protected]\n"); - }if (!osi_linux.known && !osi_linux.cmdline) { printk(KERN_NOTICE PREFIX"If \"acpi_osi=%sLinux\" works better, "
drivers/acpi/sleep/main.c +39 -1
@@ -60,6 +60,18 @@ void __init acpi_old_suspend_ordering(void) old_suspend_ordering = true; } +/* +* According to the ACPI specification the BIOS should make sure that ACPI is +* enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states. Still, +* some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI +* on such systems during resume. Unfortunately that doesn't help in +* particularly pathological cases in which SCI_EN has to be set directly on +* resume, although the specification states very clearly that this flag is +* owned by the hardware. The set_sci_en_on_resume variable will be set in such +* cases. +*/ +static bool set_sci_en_on_resume; +/** * acpi_pm_disable_gpes - Disable the GPEs. */
@@ -201,7 +213,11 @@ static int acpi_suspend_enter(suspend_state_t pm_state) }/* If ACPI is not enabled by the BIOS, we need to enable it here. */ -acpi_enable (); +if (set_sci_en_on_resume) +acpi_set_register (ACPI_BITREG_SCI_ENABLE ,1 ); +else +acpi_enable (); +/* Reprogram control registers and execute _BFS */ acpi_leave_sleep_state_prep (acpi_state);
@@ -289,6 +305,12 @@ static int __init init_old_suspend_ordering(const struct dmi_system_id *d)return 0 ; } +static int __init init_set_sci_en_on_resume (const struct dmi_system_id *d) +{ + set_sci_en_on_resume = true; +return 0 ; +} +static struct dmi_system_id __initdata acpisleep_dmi_table[] = { { .callback = init_old_suspend_ordering,
@@ -306,6 +328,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"), }, }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Apple MacBook 1,1", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Apple Computer, Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Apple MacMini 1,1", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Apple Computer, Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"), + }, + }, {}, };#endif /* CONFIG_SUSPEND */
drivers/ata/libata-sff.c +11 -2
@@ -1227,10 +1227,19 @@ fsm_start:/* ATA PIO protocol */ if (unlikely ((status &ATA_DRQ ) ==0 )) {/* handle BSY=0, DRQ=0 as error */ -if (likely (status & (ATA_ERR |ATA_DF ))) +if (likely (status & (ATA_ERR |ATA_DF ))) {/* device stops HSM for abort/error */ qc->err_mask |=AC_ERR_DEV ; -else { + +/* If diagnostic failed and this is +* IDENTIFY, it's likely a phantom +* device. Mark hint. +*/ +if (qc->dev->horkage & +ATA_HORKAGE_DIAGNOSTIC ) + qc->err_mask |= +AC_ERR_NODEV_HINT ; + }else {/* HSM violation. Let EH handle this. * Phantom devices also trigger this * condition. Mark hint.
drivers/char/applicom.c +2 -4
@@ -712,8 +712,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un IndexCard = adgl->num_card-1 ; -if (cmd !=0 && cmd !=6 && - ((IndexCard >=MAX_BOARD ) || !apbs[IndexCard].RamIO)) { +if (cmd !=6 && ((IndexCard >=MAX_BOARD ) || !apbs[IndexCard].RamIO)) {static int warncount =10 ;if (warncount) {printk (KERN_WARNING "APPLICOM driver IOCTL, bad board number %d\n" ,(int )IndexCard+1 );
@@ -832,8 +831,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un }break ;default : -printk (KERN_INFO "APPLICOM driver ioctl, unknown function code %d\n" ,cmd) ; - ret = -EINVAL ; + ret = -ENOTTY ;break ; } Dummy =readb (apbs[IndexCard].RamIO +VERS );
drivers/edac/cell_edac.c +3 -0
@@ -9,6 +9,7 @@*/ #undef DEBUG +#include <linux/edac.h> #include <linux/module.h> #include <linux/init.h> #include <linux/platform_device.h>
@@ -164,6 +165,8 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)if (regs ==NULL )return -ENODEV ; + edac_op_state =EDAC_OPSTATE_POLL ; +/* Get channel population */ reg =in_be64 (®s->mic_mnt_cfg);dev_dbg (&pdev->dev,"MIC_MNT_CFG = 0x%016lx\n" , reg);
drivers/hid/usbhid/hid-quirks.c +2 -0
@@ -83,6 +83,7 @@#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b +#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242#define USB_VENDOR_ID_ASUS 0x0b05
@@ -458,6 +459,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL }, { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV }, + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },
drivers/input/serio/i8042-x86ia64io.h +29 -0
@@ -135,6 +135,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "5a"), }, }, + { + .ident = "Blue FB5601", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "blue"), + DMI_MATCH(DMI_PRODUCT_NAME, "FB5601"), + DMI_MATCH(DMI_PRODUCT_VERSION, "M606"), + }, + }, { } };
@@ -322,6 +330,27 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"), }, }, + { + .ident = "IBM 2656", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2656"), + }, + }, + { + .ident = "Dell XPS M1530", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"), + }, + }, + { + .ident = "Compal HEL80I", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"), + DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"), + }, + }, { } };
drivers/net/cxgb3/adapter.h +1 -0
@@ -285,6 +285,7 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_status,void t3_sge_start (struct adapter *adap);void t3_sge_stop (struct adapter *adap); +void t3_stop_sge_timers (struct adapter *adap);void t3_free_sge_resources (struct adapter *adap);void t3_sge_err_intr_handler (struct adapter *adapter);irq_handler_t t3_intr_handler (struct adapter *adap,int polling);
drivers/net/cxgb3/cxgb3_main.c +5 -0
@@ -479,6 +479,7 @@ static int setup_sge_qsets(struct adapter *adap) irq_idx, &adap->params.sge.qset[qset_idx], ntxq, dev);if (err) { +t3_stop_sge_timers (adap);t3_free_sge_resources (adap);return err; }
@@ -2449,6 +2450,9 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev, test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map))offload_close (&adapter->tdev); +/* Stop SGE timers */ +t3_stop_sge_timers (adapter); + adapter->flags &= ~FULL_INIT_DONE ;pci_disable_device (pdev);
@@ -2801,6 +2805,7 @@ static void __devexit remove_one(struct pci_dev *pdev)if (test_bit (i, &adapter->registered_device_map))unregister_netdev (adapter->port[i]); +t3_stop_sge_timers (adapter);t3_free_sge_resources (adapter);cxgb_disable_msi (adapter);
drivers/net/cxgb3/sge.c +18 -38
80 lines not on this page · raw message
drivers/net/niu.c +1 -2
@@ -51,8 +51,7 @@ MODULE_VERSION(DRV_MODULE_VERSION);#ifndef readqstatic u64 readq (void __iomem *reg) { -return (((u64 )readl (reg +0x4UL ) <<32 ) | - (u64 )readl (reg)); +return ((u64 )readl (reg)) | (((u64 )readl (reg +4UL )) <<32 ); }static void writeq (u64 val,void __iomem *reg)
drivers/net/pppol2tp.c +1 -0
@@ -1353,6 +1353,7 @@ static int pppol2tp_release(struct socket *sock)kfree_skb (skb);sock_put (sk); } +sock_put (sk); }release_sock (sk);
drivers/pci/pcie/aspm.c +26 -3
@@ -16,6 +16,7 @@#include <linux/pm.h> #include <linux/init.h> #include <linux/slab.h> +#include <linux/jiffies.h> #include <linux/pci-aspm.h> #include "../pci.h"
@@ -161,11 +162,12 @@ static void pcie_check_clock_pm(struct pci_dev *pdev)*/ static void pcie_aspm_configure_common_clock (struct pci_dev *pdev) { -int pos, child_pos; +int pos, child_pos, i =0 ;u16 reg16 =0 ;struct pci_dev *child_dev;int same_clock =1 ; - +unsigned long start_jiffies; +u16 child_regs[8 ], parent_reg;/* * all functions of a slot should have the same Slot Clock * Configuration, so just check one function
@@ -191,16 +193,19 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev) child_pos =pci_find_capability (child_dev,PCI_CAP_ID_EXP );pci_read_config_word (child_dev, child_pos +PCI_EXP_LNKCTL , ®16); + child_regs[i] = reg16;if (same_clock) reg16 |=PCI_EXP_LNKCTL_CCC ;else reg16 &= ~PCI_EXP_LNKCTL_CCC ;pci_write_config_word (child_dev, child_pos +PCI_EXP_LNKCTL , reg16); + i++; }/* Configure upstream component */ pci_read_config_word (pdev, pos +PCI_EXP_LNKCTL , ®16); + parent_reg = reg16;if (same_clock) reg16 |=PCI_EXP_LNKCTL_CCC ;else
@@ -212,12 +217,30 @@ static void pcie_aspm_configure_common_clock(struct pci_dev *pdev)pci_write_config_word (pdev, pos +PCI_EXP_LNKCTL , reg16);/* Wait for link training end */ -while (1 ) { +/* break out after waiting for 1 second */ + start_jiffies = jiffies; +while ((jiffies - start_jiffies) <HZ ) {pci_read_config_word (pdev, pos +PCI_EXP_LNKSTA , ®16);if (!(reg16 &PCI_EXP_LNKSTA_LT ))break ;cpu_relax (); } +/* training failed -> recover */ +if ((jiffies - start_jiffies) >=HZ ) { +dev_printk (KERN_ERR , &pdev->dev,"ASPM: Could not configure" +" common clock\n" ); + i =0 ; +list_for_each_entry (child_dev, &pdev->subordinate->devices, + bus_list) { + child_pos =pci_find_capability (child_dev, +PCI_CAP_ID_EXP ); +pci_write_config_word (child_dev, + child_pos +PCI_EXP_LNKCTL , + child_regs[i]); + i++; + } +pci_write_config_word (pdev, pos +PCI_EXP_LNKCTL , parent_reg); + } }/*
drivers/pci/slot.c +1 -0
@@ -243,6 +243,7 @@ placeholder: __func__, pci_domain_nr(parent), parent->number, slot_nr); out: +kfree (slot_name);up_write (&pci_bus_sem);return slot; err:
drivers/pnp/base.h +1 -1
@@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res);void dbg_pnp_show_resources (struct pnp_dev *dev,char *desc);void pnp_free_resources (struct pnp_dev *dev); -int pnp_resource_type (struct resource *res); +unsigned long pnp_resource_type (struct resource *res);struct pnp_resource {struct list_head list;
drivers/pnp/quirks.c +1 -1
@@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)*/ for_each_pci_dev (pdev) {for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { -unsigned int type; +unsigned long type; type =pci_resource_flags (pdev, i) & (IORESOURCE_IO |IORESOURCE_MEM );
drivers/pnp/resource.c +2 -2
@@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)#endif } -int pnp_resource_type (struct resource *res) +unsigned long pnp_resource_type (struct resource *res) {return res->flags & (IORESOURCE_IO |IORESOURCE_MEM |IORESOURCE_IRQ |IORESOURCE_DMA ); }struct resource *pnp_get_resource (struct pnp_dev *dev, -unsigned int type,unsigned int num) +unsigned long type,unsigned int num) {struct pnp_resource *pnp_res;struct resource *res;
drivers/spi/spidev.c +3 -1
@@ -598,7 +598,9 @@ static int spidev_probe(struct spi_device *spi) }mutex_unlock (&device_list_lock); -if (status !=0 ) +if (status ==0 ) +spi_set_drvdata (spi, spidev); +else kfree (spidev);return status;
drivers/usb/serial/option.c +153 -23
276 lines not on this page · raw message
drivers/usb/storage/unusual_devs.h +313 -21
466 lines not on this page · raw message
drivers/watchdog/ib700wdt.c +1 -1
@@ -154,7 +154,7 @@ static int ibwdt_set_heartbeat(int t)return -EINVAL ;for (i =0x0F ; i >-1 ; i--) -if (wd_times[i] > t) +if (wd_times[i] >= t)break ; wd_margin = i;return 0 ;
fs/binfmt_em86.c +1 -1
@@ -43,7 +43,7 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs)return -ENOEXEC ; } - bprm->sh_bang =1 ;/* Well, the bang-shell is implicit... */ + bprm->recursion_depth++;/* Well, the bang-shell is implicit... */ allow_write_access (bprm->file);fput (bprm->file); bprm->file =NULL ;
fs/binfmt_misc.c +2 -2
@@ -117,7 +117,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) goto _ret; retval = -ENOEXEC ; -if (bprm->misc_bang) +if (bprm->recursion_depth >BINPRM_MAX_RECURSION ) goto _ret;/* to keep locking time low, we copy the interpreter string */
@@ -197,7 +197,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)if (retval <0 ) goto _error; - bprm->misc_bang =1 ; + bprm->recursion_depth++; retval =search_binary_handler (bprm, regs);if (retval <0 )
fs/binfmt_script.c +3 -2
@@ -22,14 +22,15 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)char interp[BINPRM_BUF_SIZE ];int retval; -if ((bprm->buf[0 ] !='#' ) || (bprm->buf[1 ] !='!' ) || (bprm->sh_bang)) +if ((bprm->buf[0 ] !='#' ) || (bprm->buf[1 ] !='!' ) || + (bprm->recursion_depth >BINPRM_MAX_RECURSION ))return -ENOEXEC ;/* * This section does the #! interpretation. * Sorta complicated, but hopefully it will work. -TYT */ - bprm->sh_bang =1 ; + bprm->recursion_depth++;allow_write_access (bprm->file);fput (bprm->file); bprm->file =NULL ;
fs/cifs/connect.c +21 -15
@@ -128,7 +128,7 @@ cifs_reconnect(struct TCP_Server_Info *server)struct mid_q_entry *mid_entry;spin_lock (&GlobalMid_Lock); -if (kthread_should_stop ()) { +if (server->tcpStatus == CifsExiting) {/* the demux thread will exit normally next time through the loop */ spin_unlock (&GlobalMid_Lock);
@@ -182,7 +182,8 @@ cifs_reconnect(struct TCP_Server_Info *server)spin_unlock (&GlobalMid_Lock);up (&server->tcpSem); -while ((!kthread_should_stop ()) && (server->tcpStatus != CifsGood)) { +while ((server->tcpStatus != CifsExiting) && + (server->tcpStatus != CifsGood)) {try_to_freeze ();if (server->addr.sockAddr6.sin6_family ==AF_INET6 ) { rc = ipv6_connect(&server->addr.sockAddr6,
@@ -200,7 +201,7 @@ cifs_reconnect(struct TCP_Server_Info *server) }else {atomic_inc (&tcpSesReconnectCount);spin_lock (&GlobalMid_Lock); -if (!kthread_should_stop ()) +if (server->tcpStatus != CifsExiting) server->tcpStatus = CifsGood; server->sequence_number =0 ;spin_unlock (&GlobalMid_Lock);
@@ -355,7 +356,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) GFP_KERNEL);set_freezable (); -while (!kthread_should_stop ()) { +while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;if (bigbuf ==NULL ) {
@@ -396,7 +397,7 @@ incomplete_rcv:kernel_recvmsg (csocket, &smb_msg, &iov,1 , pdu_length,0 /* BB other flags? */ ); -if (kthread_should_stop ()) { +if (server->tcpStatus == CifsExiting) {break ; }else if (server->tcpStatus == CifsNeedReconnect) {cFYI (1 , ("Reconnect after server stopped responding" ));
@@ -527,7 +528,7 @@ incomplete_rcv: total_read += length) { length =kernel_recvmsg (csocket, &smb_msg, &iov,1 , pdu_length - total_read,0 ); -if (kthread_should_stop () || +if ((server->tcpStatus == CifsExiting) || (length == -EINTR )) {/* then will exit */ reconnect =2 ;
@@ -661,14 +662,6 @@ multi_t2_fnd:spin_unlock (&GlobalMid_Lock);wake_up_all (&server->response_q); -/* don't exit until kthread_stop is called */ -set_current_state (TASK_UNINTERRUPTIBLE ); -while (!kthread_should_stop ()) { -schedule (); -set_current_state (TASK_UNINTERRUPTIBLE ); - } -set_current_state (TASK_RUNNING ); -/* check if we have blocked requests that need to free */ /* Note that cifs_max_pending is normally 50, but can be set at module install time to as little as two */
@@ -764,6 +757,7 @@ multi_t2_fnd:read_unlock (&cifs_tcp_ses_lock);kfree (server->hostname); + task_to_wake =xchg (&server->tsk,NULL );kfree (server); length =atomic_dec_return (&tcpSesAllocCount);
@@ -771,6 +765,16 @@ multi_t2_fnd:mempool_resize (cifs_req_poolp, length + cifs_min_rcv,GFP_KERNEL ); +/* if server->tsk was NULL then wait for a signal before exiting */ +if (!task_to_wake) { +set_current_state (TASK_INTERRUPTIBLE ); +while (!signal_pending (current)) { +schedule (); +set_current_state (TASK_INTERRUPTIBLE ); + } +set_current_state (TASK_RUNNING ); + } +return 0 ; }
@@ -2310,7 +2314,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,/* on error free sesinfo and tcon struct if needed */ mount_fail_check:if (rc) { -/* If find_unc succeeded then rc == 0 so we can not end */ +/* If find_unc succeeded then rc == 0 so we can not end */ /* up accidently freeing someone elses tcon struct */ if (tcon)cifs_put_tcon (tcon);
@@ -3715,8 +3719,10 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,cERROR (1 , ("Send error in SessSetup = %d" , rc)); }else {cFYI (1 , ("CIFS Session Established successfully" )); +spin_lock (&GlobalMid_Lock); pSesInfo->status = CifsGood; pSesInfo->need_reconnect = false; +spin_unlock (&GlobalMid_Lock); } ss_err_exit:
fs/exec.c +9 -1
@@ -1164,6 +1164,7 @@ EXPORT_SYMBOL(remove_arg_zero);*/ int search_binary_handler (struct linux_binprm *bprm,struct pt_regs *regs) { +unsigned int depth = bprm->recursion_depth;int try,retval;struct linux_binfmt *fmt;#ifdef __alpha__
@@ -1224,8 +1225,15 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)continue ;read_unlock (&binfmt_lock); retval =fn (bprm, regs); +/* +* Restore the depth counter to its starting value +* in this call, so we don't have to rely on every +* load_binary function to restore it on return. +*/ + bprm->recursion_depth = depth;if (retval >=0 ) { -tracehook_report_exec (fmt, bprm, regs); +if (depth ==0 ) +tracehook_report_exec (fmt, bprm, regs);put_binfmt (fmt);allow_write_access (bprm->file);if (bprm->file)
fs/fcntl.c +7 -0
@@ -19,6 +19,7 @@#include <linux/signal.h> #include <linux/rcupdate.h> #include <linux/pid_namespace.h> +#include <linux/smp_lock.h> #include <asm/poll.h> #include <asm/siginfo.h>
@@ -175,6 +176,11 @@ static int setfl(int fd, struct file * filp, unsigned long arg)if (error)return error; +/* +* We still need a lock here for now to keep multiple FASYNC calls +* from racing with each other. +*/ +lock_kernel ();if ((arg ^ filp->f_flags) &FASYNC ) {if (filp->f_op && filp->f_op->fasync) { error = filp->f_op->fasync (fd, filp, (arg &FASYNC ) !=0 );
@@ -185,6 +191,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) filp->f_flags = (arg &SETFL_MASK ) | (filp->f_flags & ~SETFL_MASK ); out: +unlock_kernel ();return error; }
fs/ioctl.c +8 -4
@@ -123,11 +123,9 @@ static int ioctl_fioasync(unsigned int fd, struct file *filp,/* Did FASYNC state change ? */ if ((flag ^ filp->f_flags) &FASYNC ) { -if (filp->f_op && filp->f_op->fasync) { -lock_kernel (); +if (filp->f_op && filp->f_op->fasync) error = filp->f_op->fasync (fd, filp, on); -unlock_kernel (); - }else +else error = -ENOTTY ; }if (error)
@@ -163,11 +161,17 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,break ;case FIONBIO : +/* BKL needed to avoid races tweaking f_flags */ +lock_kernel (); error =ioctl_fionbio (filp, argp); +unlock_kernel ();break ;case FIOASYNC : +/* BKL needed to avoid races tweaking f_flags */ +lock_kernel (); error =ioctl_fioasync (fd, filp, argp); +unlock_kernel ();break ;case FIOQSIZE :
fs/jbd/checkpoint.c +37 -12
150 lines not on this page · raw message
fs/jbd/journal.c +22 -6
@@ -1121,9 +1121,12 @@ recovery_error:* * Release a journal_t structure once it is no longer in use by the * journaled object. +* Return <0 if we couldn't clean up the journal. */ -void journal_destroy (journal_t *journal) +int journal_destroy (journal_t *journal) { +int err =0 ; +/* Wait for the commit thread to wake up and die. */ journal_kill_thread (journal);
@@ -1146,11 +1149,16 @@ void journal_destroy(journal_t *journal)J_ASSERT (journal->j_checkpoint_transactions ==NULL );spin_unlock (&journal->j_list_lock); -/* We can now mark the journal as empty. */ - journal->j_tail =0 ; - journal->j_tail_sequence = ++journal->j_transaction_sequence;if (journal->j_sb_buffer) { -journal_update_superblock (journal,1 ); +if (!is_journal_aborted (journal)) { +/* We can now mark the journal as empty. */ + journal->j_tail =0 ; + journal->j_tail_sequence = + ++journal->j_transaction_sequence; +journal_update_superblock (journal,1 ); + }else { + err = -EIO ; + }brelse (journal->j_sb_buffer); }
@@ -1160,6 +1168,8 @@ void journal_destroy(journal_t *journal)journal_destroy_revoke (journal);kfree (journal->j_wbuf);kfree (journal); + +return err; }
@@ -1359,10 +1369,16 @@ int journal_flush(journal_t *journal)spin_lock (&journal->j_list_lock);while (!err && journal->j_checkpoint_transactions !=NULL ) {spin_unlock (&journal->j_list_lock); +mutex_lock (&journal->j_checkpoint_mutex); err =log_do_checkpoint (journal); +mutex_unlock (&journal->j_checkpoint_mutex);spin_lock (&journal->j_list_lock); }spin_unlock (&journal->j_list_lock); + +if (is_journal_aborted (journal)) +return -EIO ; +cleanup_journal_tail (journal);/* Finally, mark the journal as really needing no recovery.
@@ -1384,7 +1400,7 @@ int journal_flush(journal_t *journal)J_ASSERT (journal->j_head == journal->j_tail);J_ASSERT (journal->j_tail_sequence == journal->j_transaction_sequence);spin_unlock (&journal->j_state_lock); -return err; +return 0 ; }/**
fs/jbd/recovery.c +5 -2
@@ -223,7 +223,7 @@ do { \*/ int journal_recover (journal_t *journal) { -int err; +int err, err2;journal_superblock_t * sb;struct recovery_info info;
@@ -261,7 +261,10 @@ int journal_recover(journal_t *journal) journal->j_transaction_sequence = ++info.end_transaction;journal_clear_revoke (journal); -sync_blockdev (journal->j_fs_dev); + err2 =sync_blockdev (journal->j_fs_dev); +if (!err) + err = err2; +return err; }
fs/proc/task_mmu.c +2 -2
@@ -563,9 +563,9 @@ static u64 swap_pte_to_pagemap_entry(pte_t pte)return swp_type (e) | (swp_offset (e) <<MAX_SWAPFILES_SHIFT ); } -static unsigned long pte_to_pagemap_entry (pte_t pte) +static u64 pte_to_pagemap_entry (pte_t pte) { -unsigned long pme =0 ; +u64 pme =0 ;if (is_swap_pte (pte)) pme =PM_PFRAME (swap_pte_to_pagemap_entry (pte)) |PM_PSHIFT (PAGE_SHIFT ) |PM_SWAP ;
fs/xfs/xfs_rename.c +1 -1
@@ -212,7 +212,7 @@ xfs_rename(if (unlikely ((target_dp->i_d.di_flags &XFS_DIFLAG_PROJINHERIT ) && (target_dp->i_d.di_projid != src_ip->i_d.di_projid))) { error =XFS_ERROR (EXDEV ); -xfs_rename_unlock4 (inodes,XFS_ILOCK_SHARED ); +xfs_rename_unlock4 (inodes,XFS_ILOCK_EXCL );xfs_trans_cancel (tp, cancel_flags); goto std_return; }
include/linux/binfmts.h +2 -0
@@ -36,6 +36,7 @@ struct linux_binprm{unsigned long p;/* current top of mem */ unsigned int sh_bang:1, misc_bang:1; +unsigned int recursion_depth;struct file * file;int e_uid, e_gid;kernel_cap_t cap_post_exec_permitted;
@@ -58,6 +59,7 @@ struct linux_binprm{#define BINPRM_FLAGS_EXECFD_BIT 1#define BINPRM_FLAGS_EXECFD (1 << BINPRM_FLAGS_EXECFD_BIT) +#define BINPRM_MAX_RECURSION 4/* * This structure defines the functions that are used to load the binary formats that
include/linux/blkdev.h +1 -0
@@ -623,6 +623,7 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;* default timeout for SG_IO if none specified */ #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) +#define BLK_MIN_SG_TIMEOUT (7 * HZ)#ifdef CONFIG_BOUNCE extern int init_emergency_isa_pool (void );
include/linux/jbd.h +1 -1
@@ -908,7 +908,7 @@ extern int journal_set_features (journal_t *, unsigned long, unsigned long, unsigned long);extern int journal_create (journal_t *);extern int journal_load (journal_t *journal); -extern void journal_destroy (journal_t *); +extern int journal_destroy (journal_t *);extern int journal_recover (journal_t *journal);extern int journal_wipe (journal_t *,int );extern int journal_skip_recovery (journal_t *);
include/linux/pnp.h +4 -2
@@ -22,9 +22,11 @@ struct pnp_dev;* Resource Management */ #ifdef CONFIG_PNP -struct resource *pnp_get_resource (struct pnp_dev *,unsigned int ,unsigned int ); +struct resource *pnp_get_resource (struct pnp_dev *dev,unsigned long type, +unsigned int num);#else -static inline struct resource *pnp_get_resource (struct pnp_dev *dev,unsigned int type,unsigned int num) +static inline struct resource *pnp_get_resource (struct pnp_dev *dev, +unsigned long type,unsigned int num) {return NULL ; }
kernel/fork.c +9 -6
@@ -313,17 +313,20 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) file = tmp->vm_file;if (file) {struct inode *inode = file->f_path.dentry->d_inode; +struct address_space *mapping = file->f_mapping; +get_file (file);if (tmp->vm_flags &VM_DENYWRITE )atomic_dec (&inode->i_writecount); - -/* insert tmp into the share list, just after mpnt */ -spin_lock (&file->f_mapping->i_mmap_lock); +spin_lock (&mapping->i_mmap_lock); +if (tmp->vm_flags &VM_SHARED ) + mapping->i_mmap_writable++; tmp->vm_truncate_count = mpnt->vm_truncate_count; -flush_dcache_mmap_lock (file->f_mapping); +flush_dcache_mmap_lock (mapping); +/* insert tmp into the share list, just after mpnt */ vma_prio_tree_add (tmp, mpnt); -flush_dcache_mmap_unlock (file->f_mapping); -spin_unlock (&file->f_mapping->i_mmap_lock); +flush_dcache_mmap_unlock (mapping); +spin_unlock (&mapping->i_mmap_lock); }/*
kernel/sched.c +6 -2
@@ -6500,7 +6500,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) req =list_entry (rq->migration_queue.next, struct migration_req, list);list_del_init (&req->list); +spin_unlock_irq (&rq->lock);complete (&req->done); +spin_lock_irq (&rq->lock); }spin_unlock_irq (&rq->lock);break ;
@@ -6802,15 +6804,17 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu)struct sched_domain *tmp;/* Remove the sched domains which do not contribute to scheduling. */ -for (tmp = sd; tmp; tmp = tmp->parent) { +for (tmp = sd; tmp; ) {struct sched_domain *parent = tmp->parent;if (!parent)break ; +if (sd_parent_degenerate (tmp, parent)) { tmp->parent = parent->parent;if (parent->parent) parent->parent->child = tmp; - } + }else + tmp = tmp->parent; }if (sd &&sd_degenerate (sd)) {
net/atm/svc.c +5 -1
@@ -293,7 +293,10 @@ static int svc_listen(struct socket *sock,int backlog) error = -EINVAL ; goto out; } -vcc_insert_socket (sk); +if (test_bit (ATM_VF_LISTEN , &vcc->flags)) { + error = -EADDRINUSE ; + goto out; + }set_bit (ATM_VF_WAITING , &vcc->flags);prepare_to_wait (sk->sk_sleep, &wait,TASK_UNINTERRUPTIBLE );sigd_enq (vcc,as_listen,NULL ,NULL ,&vcc->local);
@@ -307,6 +310,7 @@ static int svc_listen(struct socket *sock,int backlog) goto out; }set_bit (ATM_VF_LISTEN ,&vcc->flags); +vcc_insert_socket (sk); sk->sk_max_ack_backlog = backlog >0 ? backlog :ATM_BACKLOG_DEFAULT ; error = -sk->sk_err; out:
net/ipv4/udp.c +7 -5
@@ -302,7 +302,7 @@ static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,return result; } -static inline struct sock *udp_v4_mcast_next (struct sock *sk, +static inline struct sock *udp_v4_mcast_next (struct net *net,struct sock *sk,__be16 loc_port,__be32 loc_addr,__be16 rmt_port,__be32 rmt_addr,int dif)
@@ -314,7 +314,8 @@ static inline struct sock *udp_v4_mcast_next(struct sock *sk,sk_for_each_from (s, node) {struct inet_sock *inet =inet_sk (s); - if (s->sk_hash != hnum || + if (!net_eq(sock_net(s), net) || + s->sk_hash != hnum || (inet->daddr && inet->daddr != rmt_addr) || (inet->dport != rmt_port && inet->dport) || (inet->rcv_saddr && inet->rcv_saddr != loc_addr) ||
@@ -1097,15 +1098,16 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,read_lock (&udp_hash_lock); sk =sk_head (&udptable[udp_hashfn (net,ntohs (uh->dest))]); dif = skb->dev->ifindex; - sk =udp_v4_mcast_next (sk, uh->dest, daddr, uh->source, saddr, dif); + sk =udp_v4_mcast_next (net, sk, uh->dest, daddr, uh->source, saddr, dif);if (sk) {struct sock *sknext =NULL ; do { struct sk_buff *skb1 = skb; - sknext = udp_v4_mcast_next(sk_next(sk), uh->dest, daddr, - uh->source, saddr, dif); + sknext = udp_v4_mcast_next(net, sk_next(sk), uh->dest, + daddr, uh->source, saddr, + dif); if (sknext) skb1 = skb_clone(skb, GFP_ATOMIC);
net/ipv6/udp.c +4 -4
@@ -313,7 +313,7 @@ drop:return -1 ; } -static struct sock *udp_v6_mcast_next (struct sock *sk, +static struct sock *udp_v6_mcast_next (struct net *net,struct sock *sk,__be16 loc_port,struct in6_addr *loc_addr,__be16 rmt_port,struct in6_addr *rmt_addr,int dif)
@@ -325,7 +325,7 @@ static struct sock *udp_v6_mcast_next(struct sock *sk,sk_for_each_from (s, node) {struct inet_sock *inet =inet_sk (s); -if (sock_net (s) !=sock_net (sk)) +if (!net_eq (sock_net (s), net))continue ;if (s->sk_hash == num && s->sk_family ==PF_INET6 ) {
@@ -368,14 +368,14 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,read_lock (&udp_hash_lock); sk =sk_head (&udptable[udp_hashfn (net,ntohs (uh->dest))]); dif =inet6_iif (skb); - sk =udp_v6_mcast_next (sk, uh->dest, daddr, uh->source, saddr, dif); + sk =udp_v6_mcast_next (net, sk, uh->dest, daddr, uh->source, saddr, dif);if (!sk) {kfree_skb (skb); goto out; } sk2 = sk; -while ((sk2 =udp_v6_mcast_next (sk_next (sk2), uh->dest, daddr, +while ((sk2 =udp_v6_mcast_next (net,sk_next (sk2), uh->dest, daddr, uh->source, saddr, dif))) {struct sk_buff *buff =skb_clone (skb,GFP_ATOMIC );if (buff) {
net/unix/af_unix.c +1 -1
@@ -2230,7 +2230,7 @@ static int unix_net_init(struct net *net)#endif error =0 ; out: -return 0 ; +return error; }static void unix_net_exit (struct net *net)
sound/pci/emu10k1/emu10k1_main.c +3 -0
@@ -1464,6 +1464,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { .ca0151_chip = 1, .spk71 = 1, .spdif_bug = 1, + .invert_shared_spdif = 1, /* digital/analog switch swapped */ .ac97_chip = 1} , {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102, .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]",
@@ -1473,6 +1474,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { .ca0151_chip = 1, .spk71 = 1, .spdif_bug = 1, + .invert_shared_spdif = 1, /* digital/analog switch swapped */ .ac97_chip = 1} , {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102, .driver = "Audigy2", .name = "Audigy 2 ZS [2001]",
@@ -1482,6 +1484,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { .ca0151_chip = 1, .spk71 = 1, .spdif_bug = 1, + .invert_shared_spdif = 1, /* digital/analog switch swapped */ .ac97_chip = 1} ,/* Audigy 2 */ /* Tested by [email protected] 3rd July 2005 */
sound/pci/hda/hda_proc.c +1 -1
@@ -216,7 +216,7 @@ static void print_pin_caps(struct snd_info_buffer *buffer,unsigned int caps, val; caps =snd_hda_param_read (codec, nid,AC_PAR_PIN_CAP ); -snd_iprintf (buffer," Pincap 0x08%x:" , caps); +snd_iprintf (buffer," Pincap 0x%08x:" , caps);if (caps &AC_PINCAP_IN )snd_iprintf (buffer," IN" );if (caps &AC_PINCAP_OUT )
sound/pci/hda/patch_analog.c +9 -1
@@ -2247,8 +2247,12 @@ static struct hda_verb ad1988_spdif_init_verbs[] = {/* AD1989 has no ADC -> SPDIF route */ static struct hda_verb ad1989_spdif_init_verbs[] = { -/* SPDIF out pin */ +/* SPDIF-1 out pin */ + {0x1b ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_OUT }, {0x1b ,AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_UNMUTE |0x27 },/* 0dB */ +/* SPDIF-2/HDMI out pin */ + {0x1d ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_OUT }, + {0x1d ,AC_VERB_SET_AMP_GAIN_MUTE ,AMP_OUT_UNMUTE |0x27 },/* 0dB */ { } };
@@ -2868,6 +2872,7 @@ static struct snd_pci_quirk ad1988_cfg_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x81ec ,"Asus P5B-DLX" ,AD1988_6STACK_DIG ),SND_PCI_QUIRK (0x1043 ,0x81f6 ,"Asus M2N-SLI" ,AD1988_6STACK_DIG ),SND_PCI_QUIRK (0x1043 ,0x8277 ,"Asus P5K-E/WIFI-AP" ,AD1988_6STACK_DIG ), + SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG), {} };
@@ -3842,6 +3847,9 @@ static const char *ad1884a_models[AD1884A_MODELS] = {static struct snd_pci_quirk ad1884a_cfg_tbl[] = {SND_PCI_QUIRK (0x103c ,0x3030 ,"HP" ,AD1884A_MOBILE ), +SND_PCI_QUIRK (0x103c ,0x3056 ,"HP" ,AD1884A_MOBILE ), +SND_PCI_QUIRK (0x103c ,0x30e7 ,"HP EliteBook 8530p" ,AD1884A_LAPTOP ), +SND_PCI_QUIRK (0x103c ,0x3614 ,"HP 6730s" ,AD1884A_LAPTOP ),SND_PCI_QUIRK (0x17aa ,0x20ac ,"Thinkpad X300" ,AD1884A_THINKPAD ), {} };
sound/pci/hda/patch_realtek.c +151 -1
316 lines not on this page · raw message
sound/pci/hda/patch_sigmatel.c +41 -4
99 lines not on this page · raw message
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.27.9 kernel.
This is still missing the fix for the regression from .7 to .8 that I reported here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00006.html
The fix is here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00998.html
Been running that on top of -stable and it does fix the problem. It also seems to work for other people. Is there some particular reason why this was not included? I tested and cc'ed stable@ for a reason. :(
-h
Quoted 8 lines · Holger Hoffstaette
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.27.9 kernel.
This is still missing the fix for the regression from .7 to .8 that I reported here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00006.html
Quoted 6 lines
The fix is here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00998.htmlBeen running that on top of -stable and it does fix the problem. It also seems to work for other people. Is there some particular reason why this was not included? I tested and cc'ed stable@ for a reason. :(
The patch is not in Linus's tree yet, right? That is a requirement to go into the -stable releases.
Also, it is not exactly obvious why a change for idr is needed. The "new" drm code in Fedora releases is understandable, but that is not code that is in the main 2.6.27-stable tree, right?
Also, please cc: the stable developers if you want them to pay attention to messages like this.
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 10 lines · Holger Hoffstaette
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.27.9 kernel.
This is still missing the fix for the regression from .7 to .8 that I reported here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00006.htmlThe fix is here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00998.html
Quoted 6 lines
Quoted 3 lines
Been running that on top of -stable and it does fix the problem. It also seems to work for other people. Is there some particular reason why this was not included? I tested and cc'ed stable@ for a reason. :(
The patch is not in Linus's tree yet, right? That is a requirement to go into the -stable releases.
It is: http://tinyurl.com/5gpqkj
Quoted 3 lines
Also, it is not exactly obvious why a change for idr is needed. The "new" drm code in Fedora releases is understandable, but that is not code that is in the main 2.6.27-stable tree, right?
Looking at the log it seems that it fixes a regression introduced by the previous commit, which seems to affect RCU in general (how or why? no idea). The Bugzilla bug mentions SysV shared memory and other generic things, so I'm not the least surprised that samba and apparently other things as well go bonkers.
That's really all I know.
thanks
Holger
Quoted 1 line · Holger Hoffstätte
That's really all I know.
Apart from all the mainline excuses why patches aren't accepted - I'd REALLY like to know why each and every 2.6.27 kernel so totally fails on me when it comes to X ... the vesa driver refuses to come up with the magic to do its 75 Hz wonders of the pre .27 series.
Really, there's no error that I could track down to solve the problem. X seems to run in a loop (unkillable), but a reboot works (if there's not a kernel panic and hard lockup involved first whilst me trying to get the darn thing working) - my screen even tells me during these desperate times that there's no signal. Awesome.
Seems like other people encountered the same problem but short of getting rubbed the obvious answers in their faces, namely mentioning some magic spell to cope with nvidia (well, doh!), nothing of substance ever really has come up. Bummer.
Framebuffer or not, radeon driver or not, vesa driver or not, I still get that 60 Hz eye cancer at best. Sucks. MTRR cleanup enabled, PAT enabled or not, nada.
Strangely, this reminds me of my hatred towards VIA and its Nehemiah scam. Suitcase nukes, what a wonderful concept :)
I hope the new mainboard (GMA 3100) works out of the box, cos the current ancient (!) ati card gives me nothing but a headache on .27.
01:00.0 VGA compatible controller: ATI Technologies Inc Radeon RV250 If [Radeon 9000] (rev 01) (prog-if 00 [VGA controller])
Subsystem: PC Partner Limited RV250 If [Sapphire Radeon 9000
Pro]
Flags: bus master, stepping, 66MHz, medium devsel, latency
64, IRQ 19
Memory at e8000000 (32-bit, prefetchable) [size=64M]
I/O ports at a800 [size=256]
Memory at ff4f0000 (32-bit, non-prefetchable) [size=64K]
Expansion ROM at ff4c0000 [disabled] [size=128K]
Capabilities: [58] AGP version 2.0
Capabilities: [50] Power Management version 2
Kernel driver in use: radeonfbWriting this on 2.6.26.8. .... Just venting, dont mind me.
Signature · 1 line
left blank, right bald
Quoted 12 lines · Holger Hoffstätte
Quoted 11 lines · Greg KH
Quoted 10 lines · Holger Hoffstaette
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.27.9 kernel.
This is still missing the fix for the regression from .7 to .8 that I reported here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00006.htmlThe fix is here:
http://lkml.indiana.edu/hypermail/linux/kernel/0812.1/00998.html
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Been running that on top of -stable and it does fix the problem. It also seems to work for other people. Is there some particular reason why this was not included? I tested and cc'ed stable@ for a reason. :(
The patch is not in Linus's tree yet, right? That is a requirement to go into the -stable releases.
It is: http://tinyurl.com/5gpqkj
Ah, missed that, I'll queue it up for the next stable release later this week.
thanks,
greg k-h
Quoted 8 lines · markus reichelt
Quoted 1 line · Holger Hoffstätte
That's really all I know.
Apart from all the mainline excuses why patches aren't accepted - I'd REALLY like to know why each and every 2.6.27 kernel so totally fails on me when it comes to X ... the vesa driver refuses to come up with the magic to do its 75 Hz wonders of the pre .27 series.
So 2.6.26 works, but 2.6.27 does not?
Can you run git bisect to try to track this down?
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 8 lines · markus reichelt
Quoted 1 line · Holger Hoffstätte
That's really all I know.
Apart from all the mainline excuses why patches aren't accepted - I'd REALLY like to know why each and every 2.6.27 kernel so totally fails on me when it comes to X ... the vesa driver refuses to come up with the magic to do its 75 Hz wonders of the pre .27 series.
So 2.6.26 works, but 2.6.27 does not?
Yes.
Quoted 1 line
Can you run git bisect to try to track this down?
No. I'm getting new hardware soon, anyway.
Signature · 1 line
left blank, right bald