---

yaml
---
r: 40898
b: refs/heads/master
c: 25a122f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e
+refs/heads/master: 25a122fd0d28b48782b9524a85895573e7ccf304

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/arch/powerpc/Kconfig

@@ -740,7 +740,7 @@ config ARCH_SPARSEMEM_ENABLE
 
 config ARCH_SPARSEMEM_DEFAULT
 	def_bool y
-	depends on (SMP && PPC_PSERIES) || PPC_CELL
+	depends on SMP && PPC_PSERIES
 
 config ARCH_POPULATES_NODE_MAP
 	def_bool y

trunk/arch/powerpc/boot/wrapper

@@ -179,11 +179,11 @@ if [ -z "$cacheit" ]; then
 fi
 
 if [ -n "$initrd" ]; then
-    addsec $tmp "$initrd" $isection
+    addsec $tmp "$initrd" initrd
 fi
 
 if [ -n "$dtb" ]; then
-    addsec $tmp "$dtb" .kernel:dtb
+    addsec $tmp "$dtb" dtb
 fi
 
 if [ "$platform" != "miboot" ]; then

trunk/arch/powerpc/boot/zImage.lds.S

@@ -21,11 +21,6 @@ SECTIONS
     __got2_end = .;
   }
 
-  . = ALIGN(8);
-  _dtb_start = .;
-  .kernel:dtb : { *(.kernel:dtb) }
-  _dtb_end = .;
-
   . = ALIGN(4096);
   _vmlinux_start =  .;
   .kernel:vmlinux.strip : { *(.kernel:vmlinux.strip) }

trunk/arch/powerpc/kernel/rtas_flash.c

@@ -72,10 +72,6 @@
 #define VALIDATE_BUF_SIZE 4096    
 #define RTAS_MSG_MAXLEN   64
 
-/* Quirk - RTAS requires 4k list length and block size */
-#define RTAS_BLKLIST_LENGTH 4096
-#define RTAS_BLK_SIZE 4096
-
 struct flash_block {
 	char *data;
 	unsigned long length;
@@ -87,7 +83,7 @@ struct flash_block {
  * into a version/length and translate the pointers
  * to absolute.
  */
-#define FLASH_BLOCKS_PER_NODE ((RTAS_BLKLIST_LENGTH - 16) / sizeof(struct flash_block))
+#define FLASH_BLOCKS_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct flash_block))
 struct flash_block_list {
 	unsigned long num_blocks;
 	struct flash_block_list *next;
@@ -100,9 +96,6 @@ struct flash_block_list_header { /* just the header of flash_block_list */
 
 static struct flash_block_list_header rtas_firmware_flash_list = {0, NULL};
 
-/* Use slab cache to guarantee 4k alignment */
-static kmem_cache_t *flash_block_cache = NULL;
-
 #define FLASH_BLOCK_LIST_VERSION (1UL)
 
 /* Local copy of the flash block list.
@@ -160,7 +153,7 @@ static int flash_list_valid(struct flash_block_list *flist)
 				return FLASH_IMG_NULL_DATA;
 			}
 			block_size = f->blocks[i].length;
-			if (block_size <= 0 || block_size > RTAS_BLK_SIZE) {
+			if (block_size <= 0 || block_size > PAGE_SIZE) {
 				return FLASH_IMG_BAD_LEN;
 			}
 			image_size += block_size;
@@ -184,9 +177,9 @@ static void free_flash_list(struct flash_block_list *f)
 
 	while (f) {
 		for (i = 0; i < f->num_blocks; i++)
-			kmem_cache_free(flash_block_cache, f->blocks[i].data);
+			free_page((unsigned long)(f->blocks[i].data));
 		next = f->next;
-		kmem_cache_free(flash_block_cache, f);
+		free_page((unsigned long)f);
 		f = next;
 	}
 }
@@ -285,12 +278,6 @@ static ssize_t rtas_flash_read(struct file *file, char __user *buf,
 	return msglen;
 }
 
-/* constructor for flash_block_cache */
-void rtas_block_ctor(void *ptr, kmem_cache_t *cache, unsigned long flags)
-{
-	memset(ptr, 0, RTAS_BLK_SIZE);
-}
-
 /* We could be much more efficient here.  But to keep this function
  * simple we allocate a page to the block list no matter how small the
  * count is.  If the system is low on memory it will be just as well
@@ -315,7 +302,7 @@ static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,
 	 * proc file
 	 */
 	if (uf->flist == NULL) {
-		uf->flist = kmem_cache_alloc(flash_block_cache, GFP_KERNEL);
+		uf->flist = (struct flash_block_list *) get_zeroed_page(GFP_KERNEL);
 		if (!uf->flist)
 			return -ENOMEM;
 	}
@@ -326,21 +313,21 @@ static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,
 	next_free = fl->num_blocks;
 	if (next_free == FLASH_BLOCKS_PER_NODE) {
 		/* Need to allocate another block_list */
-		fl->next = kmem_cache_alloc(flash_block_cache, GFP_KERNEL);
+		fl->next = (struct flash_block_list *)get_zeroed_page(GFP_KERNEL);
 		if (!fl->next)
 			return -ENOMEM;
 		fl = fl->next;
 		next_free = 0;
 	}
 
-	if (count > RTAS_BLK_SIZE)
-		count = RTAS_BLK_SIZE;
-	p = kmem_cache_alloc(flash_block_cache, GFP_KERNEL);
+	if (count > PAGE_SIZE)
+		count = PAGE_SIZE;
+	p = (char *)get_zeroed_page(GFP_KERNEL);
 	if (!p)
 		return -ENOMEM;
 
 	if(copy_from_user(p, buffer, count)) {
-		kmem_cache_free(flash_block_cache, p);
+		free_page((unsigned long)p);
 		return -EFAULT;
 	}
 	fl->blocks[next_free].data = p;
@@ -804,16 +791,6 @@ int __init rtas_flash_init(void)
 		goto cleanup;
 
 	rtas_flash_term_hook = rtas_flash_firmware;
-
-	flash_block_cache = kmem_cache_create("rtas_flash_cache",
-				RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
-				rtas_block_ctor, NULL);
-	if (!flash_block_cache) {
-		printk(KERN_ERR "%s: failed to create block cache\n",
-				__FUNCTION__);
-		rc = -ENOMEM;
-		goto cleanup;
-	}
 	return 0;
 
 cleanup:
@@ -828,10 +805,6 @@ int __init rtas_flash_init(void)
 void __exit rtas_flash_cleanup(void)
 {
 	rtas_flash_term_hook = NULL;
-
-	if (flash_block_cache)
-		kmem_cache_destroy(flash_block_cache);
-
 	remove_flash_pde(firmware_flash_pde);
 	remove_flash_pde(firmware_update_pde);
 	remove_flash_pde(validate_pde);

trunk/arch/powerpc/platforms/cell/spu_base.c

@@ -655,19 +655,14 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
 
 	for (i=0; i < 3; i++) {
 		ret = of_irq_map_one(np, i, &oirq);
-		if (ret) {
-			pr_debug("spu_new: failed to get irq %d\n", i);
+		if (ret)
 			goto err;
-		}
+
 		ret = -EINVAL;
-		pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
-			 oirq.controller->full_name);
 		spu->irqs[i] = irq_create_of_mapping(oirq.controller,
 					oirq.specifier, oirq.size);
-		if (spu->irqs[i] == NO_IRQ) {
-			pr_debug("spu_new: failed to map it !\n");
+		if (spu->irqs[i] == NO_IRQ)
 			goto err;
-		}
 	}
 	return 0;
 
@@ -686,7 +681,7 @@ static int spu_map_resource(struct device_node *node, int nr,
 	struct resource resource = { };
 	int ret;
 
-	ret = of_address_to_resource(node, nr, &resource);
+	ret = of_address_to_resource(node, 0, &resource);
 	if (ret)
 		goto out;
 
@@ -709,42 +704,22 @@ static int __init spu_map_device(struct spu *spu, struct device_node *node)
 
 	ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store,
 					&spu->local_store_phys);
-	if (ret) {
-		pr_debug("spu_new: failed to map %s resource 0\n",
-			 node->full_name);
+	if (ret)
 		goto out;
-	}
 	ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem,
 					&spu->problem_phys);
-	if (ret) {
-		pr_debug("spu_new: failed to map %s resource 1\n",
-			 node->full_name);
+	if (ret)
 		goto out_unmap;
-	}
 	ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2,
 					NULL);
-	if (ret) {
-		pr_debug("spu_new: failed to map %s resource 2\n",
-			 node->full_name);
+	if (ret)
 		goto out_unmap;
-	}
 
 	if (!firmware_has_feature(FW_FEATURE_LPAR))
 		ret = spu_map_resource(node, 3, (void __iomem**)&spu->priv1,
 					NULL);
-	if (ret) {
-		pr_debug("spu_new: failed to map %s resource 3\n",
-			 node->full_name);
+	if (ret)
 		goto out_unmap;
-	}
-	pr_debug("spu_new: %s maps:\n", node->full_name);
-	pr_debug("  local store   : 0x%016lx -> 0x%p\n",
-		 spu->local_store_phys, spu->local_store);
-	pr_debug("  problem state : 0x%016lx -> 0x%p\n",
-		 spu->problem_phys, spu->problem);
-	pr_debug("  priv2         :                       0x%p\n", spu->priv2);
-	pr_debug("  priv1         :                       0x%p\n", spu->priv1);
-
 	return 0;
 
 out_unmap:

trunk/block/scsi_ioctl.c

@@ -246,10 +246,10 @@ static int sg_io(struct file *file, request_queue_t *q,
 		switch (hdr->dxfer_direction) {
 		default:
 			return -EINVAL;
+		case SG_DXFER_TO_FROM_DEV:
 		case SG_DXFER_TO_DEV:
 			writing = 1;
 			break;
-		case SG_DXFER_TO_FROM_DEV:
 		case SG_DXFER_FROM_DEV:
 			break;
 		}

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/ide/ide-cd.c

@@ -724,7 +724,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
 		 * if we have an error, pass back CHECK_CONDITION as the
 		 * scsi status byte
 		 */
-		if (blk_pc_request(rq) && !rq->errors)
+		if (!rq->errors)
 			rq->errors = SAM_STAT_CHECK_CONDITION;
 
 		/* Check for tray open. */

trunk/drivers/infiniband/core/mad.c

@@ -1750,7 +1750,7 @@ ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv,
 		     */
 		    (is_direct(wc->recv_buf.mad->mad_hdr.mgmt_class) ||
 		     rcv_has_same_gid(mad_agent_priv, wr, wc)))
-			return (wr->status == IB_WC_SUCCESS) ? wr : NULL;
+			return wr;
 	}
 
 	/*

trunk/drivers/infiniband/hw/amso1100/c2.c

@@ -1155,8 +1155,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
 		goto bail10;
 	}
 
-	if (c2_register_device(c2dev))
-		goto bail10;
+	c2_register_device(c2dev);
 
 	return 0;