Skip to contentSkip to conversation

Linux 2.6.23.15

DISCUSSION Greg Kroah-Hartman 1 participant 2 messages Feb 8, 2008

Subsystems (37)
lore
Share & tools
lore
#0 lore raw

We (the -stable team) are announcing the release of the 2.6.23.15 kernel.

It contains a number of bugfixes all over the place, and all users of the 2.6.23 series are encouraged to upgrade.

I'll also be replying to this message with a copy of the patch between 2.6.23.14 and 2.6.23.15

The updated 2.6.23.y git tree can be found at:

        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=summary

thanks,

greg k-h

--------

 Makefile                           |    2 
 arch/i386/kernel/apm.c             |   10 
 arch/ia64/kernel/unaligned.c       |   11 
 arch/sparc64/kernel/chmc.c         |   16 
 arch/sparc64/kernel/entry.S        |   12 
 arch/sparc64/kernel/pci.c          |   16 
 arch/sparc64/kernel/smp.c          |   19 
 arch/sparc64/mm/init.c             |   29 -
 drivers/acpi/blacklist.c           |  388 +++++++++++++++++++
 drivers/acpi/bus.c                 |    7 
 drivers/acpi/dispatcher/dsobject.c |   91 ++++
 drivers/acpi/events/evregion.c     |    8 
 drivers/acpi/osl.c                 |  173 ++++++--
 drivers/acpi/pci_irq.c             |    9 
 drivers/acpi/video.c               |    4 
 drivers/ata/libata-core.c          |   52 +-
 drivers/ata/sata_promise.c         |   87 ++++
 drivers/atm/nicstar.c              |   19 
 drivers/char/apm-emulation.c       |   15 
 drivers/char/drm/drm_vm.c          |    2 
 drivers/char/mspec.c               |    2 
 drivers/char/tty_ioctl.c           |    2 
 drivers/connector/cn_queue.c       |    2 
 drivers/crypto/padlock-aes.c       |   53 ++
 drivers/firmware/dmi-id.c          |    2 
 drivers/input/evdev.c              |  716 +++++++++++++++++++++++------------
 drivers/input/input.c              |  666 ++++++++++++++++++++++++---------
 drivers/input/joydev.c             |  746 ++++++++++++++++++++++++-------------
 drivers/input/mousedev.c           |  743 +++++++++++++++++++++++-------------
 drivers/input/tsdev.c              |  391 +++++++++++++------
 drivers/isdn/capi/capidrv.c        |    9 
 drivers/md/dm-crypt.c              |   31 -
 drivers/md/dm-ioctl.c              |   10 
 drivers/md/dm-table.c              |    7 
 drivers/md/dm.c                    |   24 -
 drivers/md/dm.h                    |    5 
 drivers/md/raid5.c                 |    6 
 drivers/misc/thinkpad_acpi.c       |    4 
 drivers/net/atl1/atl1_main.c       |    8 
 drivers/net/cassini.c              |   45 --
 drivers/net/cassini.h              |   18 
 drivers/net/chelsio/cxgb2.c        |   66 ++-
 drivers/net/chelsio/pm3393.c       |  112 ++---
 drivers/net/chelsio/sge.c          |   40 -
 drivers/net/chelsio/sge.h          |    3 
 drivers/net/forcedeth.c            |   16 
 drivers/net/sky2.c                 |   15 
 drivers/net/usb/kaweth.c           |    2 
 drivers/net/usb/mcs7830.c          |    4 
 drivers/pci/hotplug/fakephp.c      |   39 +
 drivers/pci/quirks.c               |    6 
 drivers/spi/omap2_mcspi.c          |    6 
 drivers/usb/serial/sierra.c        |    4 
 fs/cifs/inode.c                    |    1 
 fs/exec.c                          |    6 
 fs/ncpfs/mmap.c                    |    4 
 fs/nfsd/nfs3xdr.c                  |    5 
 fs/nfsd/nfsxdr.c                   |    5 
 fs/splice.c                        |    8 
 include/asm-m68k/Kbuild            |    1 
 include/asm-powerpc/systbl.h       |    2 
 include/asm-sparc64/dma-mapping.h  |   12 
 include/asm-sparc64/hypervisor.h   |    4 
 include/asm-sparc64/pci.h          |    4 
 include/linux/acpi.h               |    7 
 include/linux/dmi.h                |    2 
 include/linux/freezer.h            |   23 +
 include/linux/input.h              |  112 +++++
 include/linux/pci_ids.h            |    2 
 include/linux/pm.h                 |    9 
 include/linux/pm_legacy.h          |    6 
 include/linux/quicklist.h          |    8 
 kernel/kmod.c                      |   13 
 kernel/power/main.c                |    3 
 kernel/power/pm.c                  |    4 
 kernel/relay.c                     |    1 
 kernel/time/tick-broadcast.c       |   56 +-
 mm/mmap.c                          |   14 
 mm/quicklist.c                     |   12 
 mm/truncate.c                      |    4 
 net/8021q/vlan.c                   |    2 
 net/atm/mpc.c                      |    7 
 net/ax25/ax25_in.c                 |    2 
 net/bridge/br_netfilter.c          |   45 +-
 net/ipv4/devinet.c                 |    2 
 net/ipv4/ip_gre.c                  |    2 
 net/ipv4/raw.c                     |    4 
 net/ipv4/route.c                   |    8 
 net/irda/af_irda.c                 |    2 
 net/key/af_key.c                   |   14 
 net/netrom/nr_dev.c                |    2 
 net/x25/x25_forward.c              |    5 
 net/xfrm/xfrm_policy.c             |    9 
 sound/oss/via82cxxx_audio.c        |   14 
 sound/usb/usx2y/usX2Yhwdep.c       |    2 
 sound/usb/usx2y/usx2yhwdeppcm.c    |    2 
 96 files changed, 3689 insertions(+), 1534 deletions(-)

Summary of changes from v2.6.23.14 to v2.6.23.15
================================================

Al Viro (1):
CASSINI: Fix endianness bug.

Alan Cox (1):
ACPI: Not register gsi for PCI IDE controller in legacy mode

Ayaz Abdulla (1):
forcedeth: mac address mcp77/79

Björn Steinbrink (1):
Fix dirty page accounting leak with ext3 data=journal

Bob Moore (2):
ACPICA: fix acpi-cpufreq boot crash due to _PSD return-by-reference
ACPICA: fix acpi_serialize hang regression

Chas Williams (1):
ATM: [nicstar] delay irq setup until card is configured

Christoph Lameter (2):
quicklists: do not release off node pages early
quicklists: Only consider memory that can be used with GFP_KERNEL

Cory T. Tusar (1):
tty: fix logic change introduced by wait_event_interruptible_timeout()

Dan Williams (1):
md: fix data corruption when a degraded raid5 array is reshaped

David Miller (8):
SPARC64: Fix sparc64 cpu cross call hangs.
SPARC64: Fix memory controller register access when non-SMP.
SPARC64: Fix two kernel linear mapping setup bugs.
NET: Correct two mistaken skb_reset_mac_header() conversions.
CASSINI: Revert 'dont touch page_count'.
CASSINI: Set skb->truesize properly on receive packets.
SPARC64: Fix OOPS in dma_sync_*_for_device()
SPARC64: Implement pci_resource_to_user()

Divy Le Ray (3):
chelsio: Fix skb->dev setting
cxgb: fix T2 GSO
cxgb: fix stats

Dmitry Torokhov (5):
Input: implement proper locking in input core
Input: evdev - implement proper locking
Input: mousedev - implement proper locking
Input: joydev - implement proper locking
Input: tsdev - implement proper locking

Eric Dumazet (1):
IPV4 ROUTE: ip_rt_dump() is unecessary slow

Eric Paris (2):
VM/Security: add security hook to do_brk (CVE-2007-6434)
security: protect from stack expantion into low vm addresses

Greg Kroah-Hartman (2):
USB: update sierra.c with latest device ids that are in 2.6.24-rc7 Linux 2.6.23.15

Henrique de Moraes Holschuh (1):
ACPI: thinkpad-acpi: fix lenovo keymap for brightness

Herbert Xu (5):
IPSEC: Fix potential dst leak in xfrm_lookup
IPV4 raw: Strengthen check on validity of iph->ihl
ATM: Check IP header validity in mpc_send_packet
IPSEC: Avoid undefined shift operation when testing algorithm ID
CRYPTO: padlock: Fix spurious ECB page fault

Ian Abbott (1):
PCI: Fix fakephp deadlock

Ingo Molnar (1):

      vfs: coredumping fix (CVE-2007-6206)

Jay Cliburn (1):
atl1: fix frame length bug

Jens Axboe (1):
splice: missing user pointer access verification (CVE-2008-0009/10)

Julia Lawall (1):
X25: Add missing x25_neigh_put

Jun'ichi Nomura (1):
dm: table detect io beyond device

Kalle Valo (1):
spi: omap2_mcspi PIO RX fix

Karsten Keil (1):
fix oops on rmmod capidrv

Len Brown (2):
PM: ACPI and APM must not be enabled at the same time
ACPI: sync blacklist w/ latest

Li Zefan (1):
CONNECTOR: Don't touch queue dev after decrement of ref count.

Mark McLoughlin (1):
INET: Fix netdev renaming and inet address labels

Matthew Wilcox (1):
m68k: Export cachectl.h

Mikael Pettersson (1):
sata_promise: ASIC PRD table bug workaround

Milan Broz (2):
dm crypt: fix write endio
dm crypt: use bio_add_page

NeilBrown (1):
knfsd: Allow NFSv2/3 WRITE calls to succeed when krb5i etc is used.

Nick Piggin (1):
vm audit: add VM_DONTEXPAND to mmap for drivers that need it (CVE-2008-0007)

Nigel Cunningham (1):
Fix unbalanced helper_lock in kernel/kmod.c

Oliver Neukum (1):
Input: fix open count handling in input interfaces

Patrick Mansfield (1):
POWERPC: Change fallocate to match unistd.h on powerpc

Patrick McHardy (2):
Netfilter: bridge: fix double POST_ROUTING invocation
Netfilter: bridge-netfilter: fix net_device refcnt leaks

Pavel Emelyanov (1):
VLAN: Lost rtnl_unlock() in vlan_ioctl()

Rafael J. Wysocki (1):
Freezer: Fix APM emulation breakage

Russ Dill (2):
NET: mcs7830 passes msecs instead of jiffies to usb_control_msg
NET: kaweth was forgotten in msec switchover of usb_start_wait_urb

Stephen Hemminger (2):
sky2: disable rx checksum on Yukon XL
sky2: RX lockup fix

Steve French (1):
CIFS: Respect umask when using POSIX mkdir

Tejun Heo (1):
libata: port and host should be stopped before hardware resources are released

Thomas Gleixner (1):
clockevents: fix reprogramming decision in oneshot broadcast

Timo Teras (1):
IPV4: ip_gre: set mac_header correctly in receive path

Tony Luck (1):
ia64: Fix unaligned handler for floating point instructions with base update

William Lee Irwin III (1):
ACPI: video_device_list corruption

Zhao Yakui (1):
ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9

maximilian attems (1):
IRDA: irda_create() nuke user triggable printk

#1 lore raw
Makefile +1 -1
index 5c31700..8920cb8 100644
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION = .14
+EXTRAVERSION = .15
 NAME = Arr Matey! A Hairy Bilge Rat!
 
 # *DOCUMENTATION*
arch/i386/kernel/apm.c +3 -7
index f02a8ac..14dc111 100644
@@ -2256,14 +2256,12 @@ static int __init apm_init(void)
 		apm_info.disabled = 1;
 		return -ENODEV;
 	}
-	if (PM_IS_ACTIVE()) {
+	if (pm_flags & PM_ACPI) {
 		printk(KERN_NOTICE "apm: overridden by ACPI.\n");
 		apm_info.disabled = 1;
 		return -ENODEV;
 	}
-#ifdef CONFIG_PM_LEGACY
-	pm_active = 1;
-#endif
+	pm_flags |= PM_APM;
 
 	/*
 	 * Set up a segment that references the real mode segment 0x40
@@ -2366,9 +2364,7 @@ static void __exit apm_exit(void)
 		kthread_stop(kapmd_task);
 		kapmd_task = NULL;
 	}
-#ifdef CONFIG_PM_LEGACY
-	pm_active = 0;
-#endif
+	pm_flags &= ~PM_APM;
 }
 
 module_init(apm_init);
arch/ia64/kernel/unaligned.c +7 -4
index fe6aa5a..ecf401b 100644
@@ -1487,16 +1487,19 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs)
 	      case LDFA_OP:
 	      case LDFCCLR_OP:
 	      case LDFCNC_OP:
-	      case LDF_IMM_OP:
-	      case LDFA_IMM_OP:
-	      case LDFCCLR_IMM_OP:
-	      case LDFCNC_IMM_OP:
 		if (u.insn.x)
 			ret = emulate_load_floatpair(ifa, u.insn, regs);
 		else
 			ret = emulate_load_float(ifa, u.insn, regs);
 		break;
 
+	      case LDF_IMM_OP:
+	      case LDFA_IMM_OP:
+	      case LDFCCLR_IMM_OP:
+	      case LDFCNC_IMM_OP:
+		ret = emulate_load_float(ifa, u.insn, regs);
+		break;
+
 	      case STF_OP:
 	      case STF_IMM_OP:
 		ret = emulate_store_float(ifa, u.insn, regs);
arch/sparc64/kernel/chmc.c +10 -6
index 777d345..6d4f02e 100644
@@ -1,7 +1,6 @@
-/* $Id: chmc.c,v 1.4 2002/01/08 16:00:14 davem Exp $
- * memctrlr.c: Driver for UltraSPARC-III memory controller.
+/* memctrlr.c: Driver for UltraSPARC-III memory controller.
  *
- * Copyright (C) 2001 David S. Miller ([email protected])
+ * Copyright (C) 2001, 2007 David S. Miller ([email protected])
  */
 
 #include <linux/module.h>
@@ -16,6 +15,7 @@
 #include <linux/init.h>
 #include <asm/spitfire.h>
 #include <asm/chmctrl.h>
+#include <asm/cpudata.h>
 #include <asm/oplib.h>
 #include <asm/prom.h>
 #include <asm/io.h>
@@ -242,8 +242,11 @@ int chmc_getunumber(int syndrome_code,
  */
 static u64 read_mcreg(struct mctrl_info *mp, unsigned long offset)
 {
-	unsigned long ret;
-	int this_cpu = get_cpu();
+	unsigned long ret, this_cpu;
+
+	preempt_disable();
+
+	this_cpu = real_hard_smp_processor_id();
 
 	if (mp->portid == this_cpu) {
 		__asm__ __volatile__("ldxa	[%1] %2, %0"
@@ -255,7 +258,8 @@ static u64 read_mcreg(struct mctrl_info *mp, unsigned long offset)
 				     : "r" (mp->regs + offset),
 				       "i" (ASI_PHYS_BYPASS_EC_E));
 	}
-	put_cpu();
+
+	preempt_enable();
 
 	return ret;
 }
arch/sparc64/kernel/entry.S +12 -0
index 8059531..193791c 100644
@@ -2593,3 +2593,15 @@ sun4v_mmustat_info:
 	retl
 	 nop
 	.size	sun4v_mmustat_info, .-sun4v_mmustat_info
+
+	.globl	sun4v_mmu_demap_all
+	.type	sun4v_mmu_demap_all,#function
+sun4v_mmu_demap_all:
+	clr	%o0
+	clr	%o1
+	mov	HV_MMU_ALL, %o2
+	mov	HV_FAST_MMU_DEMAP_ALL, %o5
+	ta	HV_FAST_TRAP
+	retl
+	 nop
+	.size	sun4v_mmu_demap_all, .-sun4v_mmu_demap_all
arch/sparc64/kernel/pci.c +16 -0
index e8dac81..9bc05cf 100644
@@ -1276,4 +1276,20 @@ int pci_dma_supported(struct pci_dev *pdev, u64 device_mask)
 	return (device_mask & dma_addr_mask) == dma_addr_mask;
 }
 
+void pci_resource_to_user(const struct pci_dev *pdev, int bar,
+			  const struct resource *rp, resource_size_t *start,
+			  resource_size_t *end)
+{
+	struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
+	unsigned long offset;
+
+	if (rp->flags & IORESOURCE_IO)
+		offset = pbm->io_space.start;
+	else
+		offset = pbm->mem_space.start;
+
+	*start = rp->start - offset;
+	*end = rp->end - offset;
+}
+
 #endif /* !(CONFIG_PCI) */
arch/sparc64/kernel/smp.c +13 -6
index c73b7a4..34e8a01 100644
@@ -476,7 +476,7 @@ static __inline__ void spitfire_xcall_deliver(u64 data0, u64 data1, u64 data2, c
  */
 static void cheetah_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t mask)
 {
-	u64 pstate, ver;
+	u64 pstate, ver, busy_mask;
 	int nack_busy_id, is_jbus, need_more;
 
 	if (cpus_empty(mask))
@@ -508,14 +508,20 @@ retry:
 			       "i" (ASI_INTR_W));
 
 	nack_busy_id = 0;
+	busy_mask = 0;
 	{
 		int i;
 
 		for_each_cpu_mask(i, mask) {
 			u64 target = (i << 14) | 0x70;
 
-			if (!is_jbus)
+			if (is_jbus) {
+				busy_mask |= (0x1UL << (i * 2));
+			} else {
 				target |= (nack_busy_id << 24);
+				busy_mask |= (0x1UL <<
+					      (nack_busy_id * 2));
+			}
 			__asm__ __volatile__(
 				"stxa	%%g0, [%0] %1\n\t"
 				"membar	#Sync\n\t"
@@ -531,15 +537,16 @@ retry:
 
 	/* Now, poll for completion. */
 	{
-		u64 dispatch_stat;
+		u64 dispatch_stat, nack_mask;
 		long stuck;
 
 		stuck = 100000 * nack_busy_id;
+		nack_mask = busy_mask << 1;
 		do {
 			__asm__ __volatile__("ldxa	[%%g0] %1, %0"
 					     : "=r" (dispatch_stat)
 					     : "i" (ASI_INTR_DISPATCH_STAT));
-			if (dispatch_stat == 0UL) {
+			if (!(dispatch_stat & (busy_mask | nack_mask))) {
 				__asm__ __volatile__("wrpr %0, 0x0, %%pstate"
 						     : : "r" (pstate));
 				if (unlikely(need_more)) {
@@ -556,12 +563,12 @@ retry:
 			}
 			if (!--stuck)
 				break;
-		} while (dispatch_stat & 0x5555555555555555UL);
+		} while (dispatch_stat & busy_mask);
 
 		__asm__ __volatile__("wrpr %0, 0x0, %%pstate"
 				     : : "r" (pstate));
 
-		if ((dispatch_stat & ~(0x5555555555555555UL)) == 0) {
+		if (dispatch_stat & busy_mask) {
 			/* Busy bits will not clear, continue instead
 			 * of freezing up on this cpu.
 			 */
arch/sparc64/mm/init.c +20 -9
index 3010227..ed2484d 100644
@@ -1135,14 +1135,9 @@ static void __init mark_kpte_bitmap(unsigned long start, unsigned long end)
 	}
 }
 
-static void __init kernel_physical_mapping_init(void)
+static void __init init_kpte_bitmap(void)
 {
 	unsigned long i;
-#ifdef CONFIG_DEBUG_PAGEALLOC
-	unsigned long mem_alloced = 0UL;
-#endif
-
-	read_obp_memory("reg", &pall[0], &pall_ents);
 
 	for (i = 0; i < pall_ents; i++) {
 		unsigned long phys_start, phys_end;
@@ -1151,14 +1146,24 @@ static void __init kernel_physical_mapping_init(void)
 		phys_end = phys_start + pall[i].reg_size;
 
 		mark_kpte_bitmap(phys_start, phys_end);
+	}
+}
 
+static void __init kernel_physical_mapping_init(void)
+{
 #ifdef CONFIG_DEBUG_PAGEALLOC
+	unsigned long i, mem_alloced = 0UL;
+
+	for (i = 0; i < pall_ents; i++) {
+		unsigned long phys_start, phys_end;
+
+		phys_start = pall[i].phys_addr;
+		phys_end = phys_start + pall[i].reg_size;
+
 		mem_alloced += kernel_map_range(phys_start, phys_end,
 						PAGE_KERNEL);
-#endif
 	}
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
 	printk("Allocated %ld bytes for kernel page tables.\n",
 	       mem_alloced);
 
@@ -1400,6 +1405,10 @@ void __init paging_init(void)
 	
 	inherit_prom_mappings();
 	
+	read_obp_memory("reg", &pall[0], &pall_ents);
+
+	init_kpte_bitmap();
+
 	/* Ok, we can use our TLB miss and window trap handlers safely.  */
 	setup_tba();
 
@@ -1854,7 +1863,9 @@ void __flush_tlb_all(void)
 			     "wrpr	%0, %1, %%pstate"
 			     : "=r" (pstate)
 			     : "i" (PSTATE_IE));
-	if (tlb_type == spitfire) {
+	if (tlb_type == hypervisor) {
+		sun4v_mmu_demap_all();
+	} else if (tlb_type == spitfire) {
 		for (i = 0; i < 64; i++) {
 			/* Spitfire Errata #32 workaround */
 			/* NOTE: Always runs on spitfire, so no
drivers/acpi/blacklist.c +386 -2

411 lines not on this page · raw message

drivers/acpi/bus.c +2 -5
index 9ba778a..222fcec 100644
@@ -29,7 +29,6 @@
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/device.h>
 #include <linux/proc_fs.h>
 #ifdef CONFIG_X86
@@ -757,16 +756,14 @@ static int __init acpi_init(void)
 	result = acpi_bus_init();
 
 	if (!result) {
-#ifdef CONFIG_PM_LEGACY
-		if (!PM_IS_ACTIVE())
-			pm_active = 1;
+		if (!(pm_flags & PM_APM))
+			pm_flags |= PM_ACPI;
 		else {
 			printk(KERN_INFO PREFIX
 			       "APM is already active, exiting\n");
 			disable_acpi();
 			result = -ENODEV;
 		}
-#endif
 	} else
 		disable_acpi();
 
drivers/acpi/dispatcher/dsobject.c +85 -6

109 lines not on this page · raw message

drivers/acpi/events/evregion.c +4 -4
index e99f0c4..58ad097 100644
@@ -344,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 		 * setup will potentially execute control methods
 		 * (e.g., _REG method for this region)
 		 */
-		acpi_ex_relinquish_interpreter();
+		acpi_ex_exit_interpreter();
 
 		status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
 				      handler_desc->address_space.context,
@@ -352,7 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 
 		/* Re-enter the interpreter */
 
-		acpi_ex_reacquire_interpreter();
+		acpi_ex_enter_interpreter();
 
 		/* Check for failure of the Region Setup */
 
@@ -405,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 		 * exit the interpreter because the handler *might* block -- we don't
 		 * know what it will do, so we can't hold the lock on the intepreter.
 		 */
-		acpi_ex_relinquish_interpreter();
+		acpi_ex_exit_interpreter();
 	}
 
 	/* Call the handler */
@@ -426,7 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 		 * We just returned from a non-default handler, we must re-enter the
 		 * interpreter
 		 */
-		acpi_ex_reacquire_interpreter();
+		acpi_ex_enter_interpreter();
 	}
 
 	return_ACPI_STATUS(status);
drivers/acpi/osl.c +130 -43

220 lines not on this page · raw message

drivers/acpi/pci_irq.c +9 -0
index dd3186a..62010c2 100644
@@ -429,6 +429,15 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
 					  &polarity, &link,
 					  acpi_pci_allocate_irq);
 
+	if (irq < 0) {
+		/*
+		 * IDE legacy mode controller IRQs are magic. Why do compat
+		 * extensions always make such a nasty mess.
+		 */
+		if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE &&
+				(dev->class & 0x05) == 0)
+			return 0;
+	}
 	/*
 	 * No IRQ known to the ACPI subsystem - maybe the BIOS / 
 	 * driver reported one, then use it. Exit in any case.
drivers/acpi/video.c +2 -2
index dad84c0..9d71f25 100644
@@ -573,7 +573,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 	struct acpi_video_device_brightness *br = NULL;
 
 
-	memset(&device->cap, 0, 4);
+	memset(&device->cap, 0, sizeof(device->cap));
 
 	if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_ADR", &h_dummy1))) {
 		device->cap._ADR = 1;
@@ -693,7 +693,7 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 {
 	acpi_handle h_dummy1;
 
-	memset(&video->cap, 0, 4);
+	memset(&video->cap, 0, sizeof(video->cap));
 	if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOS", &h_dummy1))) {
 		video->cap._DOS = 1;
 	}
drivers/ata/libata-core.c +39 -13

88 lines not on this page · raw message

drivers/ata/sata_promise.c +83 -4

120 lines not on this page · raw message

drivers/atm/nicstar.c +9 -10
index 14ced85..0c205b0 100644
@@ -625,14 +625,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
    if (mac[i] == NULL)
       nicstar_init_eprom(card->membase);
 
-   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
-   {
-      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
-      error = 9;
-      ns_init_card_error(card, error);
-      return error;
-   }
-
    /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */
    writel(0x00000000, card->membase + VPM);
       
@@ -858,8 +850,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
       card->iovpool.count++;
    }
 
-   card->intcnt = 0;
-
    /* Configure NICStAR */
    if (card->rct_size == 4096)
       ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES;
@@ -868,6 +858,15 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
 
    card->efbie = 1;
 
+   card->intcnt = 0;
+   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
+   {
+      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
+      error = 9;
+      ns_init_card_error(card, error);
+      return error;
+   }
+
    /* Register device */
    card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);
    if (card->atmdev == NULL)
drivers/char/apm-emulation.c +8 -7
index ec116df..72183bd 100644
@@ -295,7 +295,6 @@ static int
 apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
 {
 	struct apm_user *as = filp->private_data;
-	unsigned long flags;
 	int err = -EINVAL;
 
 	if (!as->suser || !as->writer)
@@ -331,10 +330,16 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
 			 * Wait for the suspend/resume to complete.  If there
 			 * are pending acknowledges, we wait here for them.
 			 */
-			flags = current->flags;
+			freezer_do_not_count();
 
 			wait_event(apm_suspend_waitqueue,
 				   as->suspend_state == SUSPEND_DONE);
+
+			/*
+			 * Since we are waiting until the suspend is done, the
+			 * try_to_freeze() in freezer_count() will not trigger
+			 */
+			freezer_count();
 		} else {
 			as->suspend_state = SUSPEND_WAIT;
 			mutex_unlock(&state_lock);
@@ -362,14 +367,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
 			 * Wait for the suspend/resume to complete.  If there
 			 * are pending acknowledges, we wait here for them.
 			 */
-			flags = current->flags;
-
-			wait_event_interruptible(apm_suspend_waitqueue,
+			wait_event_freezable(apm_suspend_waitqueue,
 					 as->suspend_state == SUSPEND_DONE);
 		}
 
-		current->flags = flags;
-
 		mutex_lock(&state_lock);
 		err = as->suspend_result;
 		as->suspend_state = SUSPEND_NONE;
drivers/char/drm/drm_vm.c +2 -0
index 68e36e5..caa0bce 100644
@@ -506,6 +506,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
 	vma->vm_ops = &drm_vm_dma_ops;
 
 	vma->vm_flags |= VM_RESERVED;	/* Don't swap */
+	vma->vm_flags |= VM_DONTEXPAND;
 
 	vma->vm_file = filp;	/* Needed for drm_vm_open() */
 	drm_vm_open_locked(vma);
@@ -655,6 +656,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 		return -EINVAL;	/* This should never happen. */
 	}
 	vma->vm_flags |= VM_RESERVED;	/* Don't swap */
+	vma->vm_flags |= VM_DONTEXPAND;
 
 	vma->vm_file = filp;	/* Needed for drm_vm_open() */
 	drm_vm_open_locked(vma);
drivers/char/mspec.c +1 -1
index 04ac155..ada142a 100644
@@ -283,7 +283,7 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma,
 	vdata->refcnt = ATOMIC_INIT(1);
 	vma->vm_private_data = vdata;
 
-	vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP);
+	vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP | VM_DONTEXPAND);
 	if (vdata->type == MSPEC_FETCHOP || vdata->type == MSPEC_UNCACHED)
 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 	vma->vm_ops = &mspec_vm_ops;
drivers/char/tty_ioctl.c +1 -1
index 3ee73cf..d08c301 100644
@@ -62,7 +62,7 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout)
 	if (!timeout)
 		timeout = MAX_SCHEDULE_TIMEOUT;
 	if (wait_event_interruptible_timeout(tty->write_wait,
-			!tty->driver->chars_in_buffer(tty), timeout))
+			!tty->driver->chars_in_buffer(tty), timeout) < 0)
 		return;
 	if (tty->driver->wait_until_sent)
 		tty->driver->wait_until_sent(tty, timeout);
drivers/connector/cn_queue.c +1 -1
index 296f510..12ceed5 100644
@@ -99,8 +99,8 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id
 	spin_unlock_bh(&dev->queue_lock);
 
 	if (found) {
-		atomic_dec(&dev->refcnt);
 		cn_queue_free_callback(cbq);
+		atomic_dec(&dev->refcnt);
 		return -EINVAL;
 	}
 
drivers/crypto/padlock-aes.c +49 -4

75 lines not on this page · raw message

drivers/firmware/dmi-id.c +0 -2
index 59c3b5a..ed0d030 100644
@@ -159,8 +159,6 @@ static struct device *dmi_dev;
 	if (dmi_get_system_info(_field)) \
 		sys_dmi_attributes[i++] = & sys_dmi_##_name##_attr.attr;
 
-extern int dmi_available;
-
 static int __init dmi_id_init(void)
 {
 	int ret, i;
drivers/input/evdev.c +476 -240

993 lines not on this page · raw message

drivers/input/input.c +491 -175

521 lines not on this page · raw message

drivers/input/joydev.c +495 -251

746 lines not on this page · raw message

drivers/input/mousedev.c +472 -271

743 lines not on this page · raw message

drivers/input/tsdev.c +279 -112

391 lines not on this page · raw message

drivers/isdn/capi/capidrv.c +5 -4
index 23b6f7b..f65b7f9 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-crypt.c +15 -16
index bdc52d6..ba2e135 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-ioctl.c +3 -7
index b441d82..8a4f63b 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-table.c +6 -1
index 2bcde57..72d2250 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm.c +18 -6
index 998d450..fac09d5 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm.h +5 -0
index 462ee65..07298a3 100644

Lines of this file are not shown. View the raw message.

drivers/md/raid5.c +4 -2
index e86cacb..3085228 100644

Lines of this file are not shown. View the raw message.

drivers/misc/thinkpad_acpi.c +2 -2
index 0222bba..91047c7 100644

Lines of this file are not shown. View the raw message.

drivers/net/atl1/atl1_main.c +4 -4
index f23e13c..d2d4730 100644

Lines of this file are not shown. View the raw message.

drivers/net/cassini.c +10 -35

45 lines not on this page · raw message

drivers/net/cassini.h +9 -9
index a970804..a201431 100644

Lines of this file are not shown. View the raw message.

drivers/net/chelsio/cxgb2.c +51 -15

66 lines not on this page · raw message

drivers/net/chelsio/pm3393.c +45 -67

112 lines not on this page · raw message

drivers/net/chelsio/sge.c +16 -24
index e4f874a..d77f1eb 100644

Lines of this file are not shown. View the raw message.

drivers/net/chelsio/sge.h +1 -2
index d132a0e..80165f9 100644

Lines of this file are not shown. View the raw message.

drivers/net/forcedeth.c +8 -8
index fcbe508..cbcdf14 100644

Lines of this file are not shown. View the raw message.

drivers/net/sky2.c +8 -7
index 2575077..3ed45a3 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/kaweth.c +1 -1
index 524dc5f..9057d71 100644

Lines of this file are not shown. View the raw message.

drivers/net/usb/mcs7830.c +2 -2
index 6240b97..3bbc5c4 100644

Lines of this file are not shown. View the raw message.

drivers/pci/hotplug/fakephp.c +35 -4
index 027f686..02a09d5 100644

Lines of this file are not shown. View the raw message.

drivers/pci/quirks.c +6 -0
index 50f2dd9..75831c8 100644

Lines of this file are not shown. View the raw message.

drivers/spi/omap2_mcspi.c +3 -3
index 6b357cd..5a827ea 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/sierra.c +4 -0
index 0bb8de4..7cf21d7 100644

Lines of this file are not shown. View the raw message.

fs/cifs/inode.c +1 -0
index dd41677..48a61da 100644

Lines of this file are not shown. View the raw message.

fs/exec.c +6 -0
index 073b0b8..401b850 100644

Lines of this file are not shown. View the raw message.

fs/ncpfs/mmap.c +0 -4
index a94473d..5d8dcb9 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfs3xdr.c +4 -1
index 10f6e7d..2dc0a54 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfsxdr.c +4 -1
index cb3e7fa..bd3d5b9 100644

Lines of this file are not shown. View the raw message.

fs/splice.c +8 -0
index 02c39ae..2aa8f5a 100644

Lines of this file are not shown. View the raw message.

include/asm-m68k/Kbuild +1 -0
index c68e168..1a922fa 100644

Lines of this file are not shown. View the raw message.

include/asm-powerpc/systbl.h +1 -1
index cc6d872..11d5383 100644

Lines of this file are not shown. View the raw message.

include/asm-sparc64/dma-mapping.h +3 -9
index 1fc6554..38cbec7 100644

Lines of this file are not shown. View the raw message.

include/asm-sparc64/hypervisor.h +4 -0
index 524d498..3ad45df 100644

Lines of this file are not shown. View the raw message.

include/asm-sparc64/pci.h +4 -0
index 1393e57..f59f257 100644

Lines of this file are not shown. View the raw message.

include/linux/acpi.h +5 -2
index bf5e000..919e0a5 100644

Lines of this file are not shown. View the raw message.

include/linux/dmi.h +2 -0
index b8ac7b0..d8a946f 100644

Lines of this file are not shown. View the raw message.

include/linux/freezer.h +23 -0
index efded00..7fa9500 100644

Lines of this file are not shown. View the raw message.

include/linux/input.h +104 -8

112 lines not on this page · raw message

include/linux/pci_ids.h +2 -0
index 97de8aa..0349e82 100644

Lines of this file are not shown. View the raw message.

include/linux/pm.h +9 -0
index 48b71ba..71e589b 100644

Lines of this file are not shown. View the raw message.

include/linux/pm_legacy.h +0 -6
index 514729a..446f4f4 100644

Lines of this file are not shown. View the raw message.

include/linux/quicklist.h +0 -8
index 9371c61..39b6671 100644

Lines of this file are not shown. View the raw message.

kernel/kmod.c +6 -7
index c6a4f8a..bb7df2a 100644

Lines of this file are not shown. View the raw message.

kernel/power/main.c +3 -0
index 350b485..0e44534 100644

Lines of this file are not shown. View the raw message.

kernel/power/pm.c +0 -4
index c50d152..60c73fa 100644

Lines of this file are not shown. View the raw message.

kernel/relay.c +1 -0
index ad85501..91bbfb7 100644

Lines of this file are not shown. View the raw message.

kernel/time/tick-broadcast.c +21 -35

56 lines not on this page · raw message

mm/mmap.c +11 -3
index 0d40e66..f6058f6 100644

Lines of this file are not shown. View the raw message.

mm/quicklist.c +10 -2
index ae8189c..3f703f7 100644

Lines of this file are not shown. View the raw message.

mm/truncate.c +2 -2
index 5cdfbc1..39da569 100644

Lines of this file are not shown. View the raw message.

net/8021q/vlan.c +1 -1
index ef3f789..21af441 100644

Lines of this file are not shown. View the raw message.

net/atm/mpc.c +7 -0
index 7c85aa5..181c1c8 100644

Lines of this file are not shown. View the raw message.

net/ax25/ax25_in.c +1 -1
index 0ddaff0..8a9f0ac 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_netfilter.c +39 -6

45 lines not on this page · raw message

net/ipv4/devinet.c +1 -1
index 5dbe580..5ccc2d1 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_gre.c +1 -1
index 5c14ed6..4b09b25 100644

Lines of this file are not shown. View the raw message.

net/ipv4/raw.c +3 -1
index c6d7152..b45a610 100644

Lines of this file are not shown. View the raw message.

net/ipv4/route.c +4 -4
index 198b732..efc4a3d 100644

Lines of this file are not shown. View the raw message.

net/irda/af_irda.c +0 -2
index 4c670cf..82fdca2 100644

Lines of this file are not shown. View the raw message.

net/key/af_key.c +12 -2
index 7a5e993..9c75b9e 100644

Lines of this file are not shown. View the raw message.

net/netrom/nr_dev.c +1 -1
index c7b5d93..69e77d5 100644

Lines of this file are not shown. View the raw message.

net/x25/x25_forward.c +3 -2
index 8738ec7..3447803 100644

Lines of this file are not shown. View the raw message.

net/xfrm/xfrm_policy.c +6 -3
index 7012891..75629f4 100644

Lines of this file are not shown. View the raw message.

sound/oss/via82cxxx_audio.c +6 -8
index 5d3c037..f95aa09 100644

Lines of this file are not shown. View the raw message.

sound/usb/usx2y/usX2Yhwdep.c +1 -1
index b76b3dd..e617d7e 100644

Lines of this file are not shown. View the raw message.

sound/usb/usx2y/usx2yhwdeppcm.c +1 -1
index a5e7bcd..6e70520 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.