---

yaml
---
r: 40849
b: refs/heads/master
c: 0daa230
h: refs/heads/master
i:
  40847: 37b86d3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09123d230a294cd3b860f4ea042235b988277f0a
+refs/heads/master: 0daa2303028a63dbd1b2e38f10854f0f7bf1ef9a

trunk/.gitignore

@@ -20,7 +20,6 @@
 # Top-level generic files
 #
 tags
-TAGS
 vmlinux*
 System.map
 Module.symvers

trunk/arch/ia64/Kconfig

@@ -484,15 +484,6 @@ source "net/Kconfig"
 
 source "drivers/Kconfig"
 
-config MSPEC
-	tristate "Memory special operations driver"
-	depends on IA64
-	select IA64_UNCACHED_ALLOCATOR
-	help
-	  If you have an ia64 and you want to enable memory special
-	  operations support (formerly known as fetchop), say Y here,
-	  otherwise say N.
-
 source "fs/Kconfig"
 
 source "lib/Kconfig"

trunk/drivers/char/Kconfig

@@ -409,6 +409,14 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
+config MSPEC
+	tristate "Memory special operations driver"
+	depends on IA64
+	help
+	  If you have an ia64 and you want to enable memory special
+	  operations support (formerly known as fetchop), say Y here,
+	  otherwise say N.
+
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS

trunk/drivers/char/ipmi/ipmi_msghandler.c

@@ -1854,7 +1854,7 @@ static ssize_t provides_dev_sdrs_show(struct device *dev,
 	struct bmc_device *bmc = dev_get_drvdata(dev);
 
 	return snprintf(buf, 10, "%u\n",
-			(bmc->id.device_revision & 0x80) >> 7);
+			bmc->id.device_revision && 0x80 >> 7);
 }
 
 static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
@@ -1863,7 +1863,7 @@ static ssize_t revision_show(struct device *dev, struct device_attribute *attr,
 	struct bmc_device *bmc = dev_get_drvdata(dev);
 
 	return snprintf(buf, 20, "%u\n",
-			bmc->id.device_revision & 0x0F);
+			bmc->id.device_revision && 0x0F);
 }
 
 static ssize_t firmware_rev_show(struct device *dev,

trunk/drivers/char/mspec.c

@@ -72,11 +72,7 @@ enum {
 	MSPEC_UNCACHED
 };
 
-#ifdef CONFIG_SGI_SN
 static int is_sn2;
-#else
-#define is_sn2		0
-#endif
 
 /*
  * One of these structures is allocated when an mspec region is mmaped. The
@@ -215,7 +211,7 @@ mspec_nopfn(struct vm_area_struct *vma, unsigned long address)
 	if (vdata->type == MSPEC_FETCHOP)
 		paddr = TO_AMO(maddr);
 	else
-		paddr = maddr & ~__IA64_UNCACHED_OFFSET;
+		paddr = __pa(TO_CAC(maddr));
 
 	pfn = paddr >> PAGE_SHIFT;
 
@@ -339,7 +335,6 @@ mspec_init(void)
 	 * The fetchop device only works on SN2 hardware, uncached and cached
 	 * memory drivers should both be valid on all ia64 hardware
 	 */
-#ifdef CONFIG_SGI_SN
 	if (ia64_platform_is("sn2")) {
 		is_sn2 = 1;
 		if (is_shub2()) {
@@ -368,7 +363,6 @@ mspec_init(void)
 			goto free_scratch_pages;
 		}
 	}
-#endif
 	ret = misc_register(&cached_miscdev);
 	if (ret) {
 		printk(KERN_ERR "%s: failed to register device %i\n",

trunk/drivers/net/bonding/bond_main.c

@@ -4692,6 +4692,8 @@ static int bond_check_params(struct bond_params *params)
 	return 0;
 }
 
+static struct lock_class_key bonding_netdev_xmit_lock_key;
+
 /* Create a new bond based on the specified name and bonding parameters.
  * Caller must NOT hold rtnl_lock; we need to release it here before we
  * set up our sysfs entries.
@@ -4727,6 +4729,9 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
 	if (res < 0) {
 		goto out_bond;
 	}
+
+	lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key);
+
 	if (newbond)
 		*newbond = bond_dev->priv;
 

trunk/drivers/pci/pci-sysfs.c

@@ -642,9 +642,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
  */
 void pci_remove_sysfs_dev_files(struct pci_dev *pdev)
 {
-	if (!sysfs_initialized)
-		return;
-
 	if (pdev->cfg_size < 4096)
 		sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr);
 	else

trunk/drivers/scsi/scsi_scan.c

@@ -631,22 +631,12 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
 	 * scanning run at their own risk, or supply a user level program
 	 * that can correctly scan.
 	 */
-
-	/*
-	 * Copy at least 36 bytes of INQUIRY data, so that we don't
-	 * dereference unallocated memory when accessing the Vendor,
-	 * Product, and Revision strings.  Badly behaved devices may set
-	 * the INQUIRY Additional Length byte to a small value, indicating
-	 * these strings are invalid, but often they contain plausible data
-	 * nonetheless.  It doesn't matter if the device sent < 36 bytes
-	 * total, since scsi_probe_lun() initializes inq_result with 0s.
-	 */
-	sdev->inquiry = kmemdup(inq_result,
-				max_t(size_t, sdev->inquiry_len, 36),
-				GFP_ATOMIC);
-	if (sdev->inquiry == NULL)
+	sdev->inquiry = kmalloc(sdev->inquiry_len, GFP_ATOMIC);
+	if (sdev->inquiry == NULL) {
 		return SCSI_SCAN_NO_RESPONSE;
+	}
 
+	memcpy(sdev->inquiry, inq_result, sdev->inquiry_len);
 	sdev->vendor = (char *) (sdev->inquiry + 8);
 	sdev->model = (char *) (sdev->inquiry + 16);
 	sdev->rev = (char *) (sdev->inquiry + 32);

trunk/drivers/video/nvidia/nv_hw.c

@@ -145,18 +145,12 @@ static void nvGetClocks(struct nvidia_par *par, unsigned int *MClk,
 
 	if (par->Architecture >= NV_ARCH_40) {
 		pll = NV_RD32(par->PMC, 0x4020);
-		P = (pll >> 16) & 0x07;
+		P = (pll >> 16) & 0x03;
 		pll = NV_RD32(par->PMC, 0x4024);
 		M = pll & 0xFF;
 		N = (pll >> 8) & 0xFF;
-		if (((par->Chipset & 0xfff0) == 0x0290) ||
-				((par->Chipset & 0xfff0) == 0x0390)) {
-			MB = 1;
-			NB = 1;
-		} else {
-			MB = (pll >> 16) & 0xFF;
-			NB = (pll >> 24) & 0xFF;
-		}
+		MB = (pll >> 16) & 0xFF;
+		NB = (pll >> 24) & 0xFF;
 		*MClk = ((N * NB * par->CrystalFreqKHz) / (M * MB)) >> P;
 
 		pll = NV_RD32(par->PMC, 0x4000);

trunk/drivers/video/nvidia/nv_setup.c

@@ -359,7 +359,6 @@ int NVCommonSetup(struct fb_info *info)
 	case 0x0186:
 	case 0x0187:
 	case 0x018D:
-	case 0x0228:
 	case 0x0286:
 	case 0x028C:
 	case 0x0316:
@@ -383,10 +382,6 @@ int NVCommonSetup(struct fb_info *info)
 	case 0x034C:
 	case 0x0160:
 	case 0x0166:
-	case 0x0169:
-	case 0x016B:
-	case 0x016C:
-	case 0x016D:
 	case 0x00C8:
 	case 0x00CC:
 	case 0x0144:
@@ -644,23 +639,12 @@ int NVCommonSetup(struct fb_info *info)
 		par->fpHeight = NV_RD32(par->PRAMDAC, 0x0800) + 1;
 		par->fpSyncs = NV_RD32(par->PRAMDAC, 0x0848) & 0x30000033;
 
-		printk("nvidiafb: Panel size is %i x %i\n", par->fpWidth, par->fpHeight);
+		printk("Panel size is %i x %i\n", par->fpWidth, par->fpHeight);
 	}
 
 	if (monA)
 		info->monspecs = *monA;
 
-	if (!par->FlatPanel || !par->twoHeads)
-		par->FPDither = 0;
-
-	par->LVDS = 0;
-	if (par->FlatPanel && par->twoHeads) {
-		NV_WR32(par->PRAMDAC0, 0x08B0, 0x00010004);
-		if (par->PRAMDAC0[0x08b4] & 1)
-			par->LVDS = 1;
-		printk("nvidiafb: Panel is %s\n", par->LVDS ? "LVDS" : "TMDS");
-	}
-
 	kfree(edidA);
 	kfree(edidB);
 done:

trunk/drivers/video/nvidia/nv_type.h

@@ -129,7 +129,6 @@ struct nvidia_par {
 	int fpHeight;
 	int PanelTweak;
 	int paneltweak;
-	int LVDS;
 	int pm_state;
 	u32 crtcSync_read;
 	u32 fpSyncs;

trunk/drivers/video/nvidia/nvidia.c

@@ -1160,20 +1160,20 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
 	case 0x0340:		/* GeForceFX 5700 */
 		arch = NV_ARCH_30;
 		break;
-	case 0x0040:		/* GeForce 6800 */
-	case 0x00C0:		/* GeForce 6800 */
-	case 0x0120:		/* GeForce 6800 */
+	case 0x0040:
+	case 0x00C0:
+	case 0x0120:
 	case 0x0130:
-	case 0x0140:		/* GeForce 6600 */
-	case 0x0160:		/* GeForce 6200 */
-	case 0x01D0:		/* GeForce 7200, 7300, 7400 */
-	case 0x0090:		/* GeForce 7800 */
-	case 0x0210:		/* GeForce 6800 */
-	case 0x0220:		/* GeForce 6200 */
+	case 0x0140:
+	case 0x0160:
+	case 0x01D0:
+	case 0x0090:
+	case 0x0210:
+	case 0x0220:
 	case 0x0230:
-	case 0x0240:		/* GeForce 6100 */
-	case 0x0290:		/* GeForce 7900 */
-	case 0x0390:		/* GeForce 7600 */
+	case 0x0240:
+	case 0x0290:
+	case 0x0390:
 		arch = NV_ARCH_40;
 		break;
 	case 0x0020:		/* TNT, TNT2 */

trunk/include/asm-ia64/sn/addrs.h

@@ -136,13 +136,9 @@
  */
 #define TO_PHYS(x)		(TO_PHYS_MASK & (x))
 #define TO_CAC(x)		(CAC_BASE     | TO_PHYS(x))
-#ifdef CONFIG_SGI_SN
 #define TO_AMO(x)		(AMO_BASE     | TO_PHYS(x))
 #define TO_GET(x)		(GET_BASE     | TO_PHYS(x))
-#else
-#define TO_AMO(x)		({ BUG(); x; })
-#define TO_GET(x)		({ BUG(); x; })
-#endif
+
 
 /*
  * Covert from processor physical address to II/TIO physical address:

trunk/include/linux/personality.h

@@ -114,7 +114,7 @@ struct exec_domain {
  * Change personality of the currently running process.
  */
 #define set_personality(pers) \
-	((current->personality == (pers)) ? 0 : __set_personality(pers))
+	((current->personality == pers) ? 0 : __set_personality(pers))
 
 #endif /* __KERNEL__ */
 

trunk/include/linux/vmalloc.h

@@ -23,14 +23,13 @@ struct vm_area_struct;
 #endif
 
 struct vm_struct {
-	/* keep next,addr,size together to speedup lookups */
-	struct vm_struct	*next;
 	void			*addr;
 	unsigned long		size;
 	unsigned long		flags;
 	struct page		**pages;
 	unsigned int		nr_pages;
 	unsigned long		phys_addr;
+	struct vm_struct	*next;
 };
 
 /*

trunk/kernel/fork.c

@@ -687,7 +687,6 @@ static struct files_struct *dup_fd(struct files_struct *oldf, int *errorp)
 		 * the latest pointer.
 		 */
 		spin_lock(&oldf->file_lock);
-		open_files = count_open_files(old_fdt);
 		old_fdt = files_fdtable(oldf);
 	}
 

trunk/kernel/irq/spurious.c

@@ -147,11 +147,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
 	if (unlikely(irqfixup)) {
 		/* Don't punish working computers */
 		if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) {
-			int ok;
-
-			spin_unlock(&desc->lock);
-			ok = misrouted_irq(irq);
-			spin_lock(&desc->lock);
+			int ok = misrouted_irq(irq);
 			if (action_ret == IRQ_NONE)
 				desc->irqs_unhandled -= ok;
 		}

trunk/mm/vmalloc.c

@@ -186,8 +186,10 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl
 	if (unlikely(!area))
 		return NULL;
 
-	if (unlikely(!size))
+	if (unlikely(!size)) {
+		kfree (area);
 		return NULL;
+	}
 
 	/*
 	 * We always allocate a guard page.
@@ -530,12 +532,11 @@ void *vmalloc_user(unsigned long size)
 	void *ret;
 
 	ret = __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
-	if (ret) {
-		write_lock(&vmlist_lock);
-		area = __find_vm_area(ret);
-		area->flags |= VM_USERMAP;
-		write_unlock(&vmlist_lock);
-	}
+	write_lock(&vmlist_lock);
+	area = __find_vm_area(ret);
+	area->flags |= VM_USERMAP;
+	write_unlock(&vmlist_lock);
+
 	return ret;
 }
 EXPORT_SYMBOL(vmalloc_user);
@@ -604,12 +605,11 @@ void *vmalloc_32_user(unsigned long size)
 	void *ret;
 
 	ret = __vmalloc(size, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL);
-	if (ret) {
-		write_lock(&vmlist_lock);
-		area = __find_vm_area(ret);
-		area->flags |= VM_USERMAP;
-		write_unlock(&vmlist_lock);
-	}
+	write_lock(&vmlist_lock);
+	area = __find_vm_area(ret);
+	area->flags |= VM_USERMAP;
+	write_unlock(&vmlist_lock);
+
 	return ret;
 }
 EXPORT_SYMBOL(vmalloc_32_user);

trunk/scripts/kconfig/.gitignore

@@ -6,8 +6,6 @@ lex.*.c
 *.tab.c
 *.tab.h
 zconf.hash.c
-*.moc
-lkc_defs.h
 
 #
 # configuration programs