Commit 0854ba5f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

David writes:
  "Sparc fixes:

   1) Minor fallthru comment tweaks from Gustavo A. R. Silva.

   2) VLA removal from Kees Cook.

   3) Make sparc vdso Makefile match x86, from Masahiro Yamada.

   4) Fix clock divider programming in mach64 driver, from Mikulas
      Patocka."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: fix fall-through annotation
  sparc32: fix fall-through annotation
  sparc: vdso: clean-up vdso Makefile
  oradax: remove redundant null check before kfree
  sparc64: viohs: Remove VLA usage
  sbus: Use of_get_child_by_name helper
  sparc: Convert to using %pOFn instead of device_node.name
  mach64: detect the dot clock divider correctly on sparc
parents 0238df64 b7dc10b6

arch/sparc/kernel/auxio_64.c

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ static int auxio_probe(struct platform_device *dev) 
		auxio_devtype = AUXIO_TYPE_SBUS;

		size = 1;

	} else {

		printk("auxio: Unknown parent bus type [%s]\n",

		       dp->parent->name);

		printk("auxio: Unknown parent bus type [%pOFn]\n",

		       dp->parent);

		return -ENODEV;

	}

	auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");

arch/sparc/kernel/kgdb_32.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, 
			linux_regs->pc = addr;

			linux_regs->npc = addr + 4;

		}

		/* fallthru */

		/* fall through */



	case 'D':

	case 'k':

arch/sparc/kernel/kgdb_64.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code, 
			linux_regs->tpc = addr;

			linux_regs->tnpc = addr + 4;

		}

		/* fallthru */

		/* fall through */



	case 'D':

	case 'k':

arch/sparc/kernel/power.c

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ static int power_probe(struct platform_device *op) 


	power_reg = of_ioremap(res, 0, 0x4, "power");



	printk(KERN_INFO "%s: Control reg at %llx\n",

	       op->dev.of_node->name, res->start);

	printk(KERN_INFO "%pOFn: Control reg at %llx\n",

	       op->dev.of_node, res->start);



	if (has_button_interrupt(irq, op->dev.of_node)) {

		if (request_irq(irq,

arch/sparc/kernel/prom_32.c

+13 −13
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ static void __init sparc32_path_component(struct device_node *dp, char *tmp_buf) 
		return;



	regs = rprop->value;

	sprintf(tmp_buf, "%s@%x,%x",

		dp->name,

	sprintf(tmp_buf, "%pOFn@%x,%x",

		dp,

		regs->which_io, regs->phys_addr);

}
@@ -84,8 +84,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf) 
		return;



	regs = prop->value;

	sprintf(tmp_buf, "%s@%x,%x",

		dp->name,

	sprintf(tmp_buf, "%pOFn@%x,%x",

		dp,

		regs->which_io,

		regs->phys_addr);

}
@@ -104,13 +104,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf) 
	regs = prop->value;

	devfn = (regs->phys_hi >> 8) & 0xff;

	if (devfn & 0x07) {

		sprintf(tmp_buf, "%s@%x,%x",

			dp->name,

		sprintf(tmp_buf, "%pOFn@%x,%x",

			dp,

			devfn >> 3,

			devfn & 0x07);

	} else {

		sprintf(tmp_buf, "%s@%x",

			dp->name,

		sprintf(tmp_buf, "%pOFn@%x",

			dp,

			devfn >> 3);

	}

}
@@ -127,8 +127,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf) 


	regs = prop->value;



	sprintf(tmp_buf, "%s@%x,%x",

		dp->name,

	sprintf(tmp_buf, "%pOFn@%x,%x",

		dp,

		regs->which_io, regs->phys_addr);

}
@@ -167,8 +167,8 @@ static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf) 
		return;

	device = prop->value;



	sprintf(tmp_buf, "%s:%d:%d@%x,%x",

		dp->name, *vendor, *device,

	sprintf(tmp_buf, "%pOFn:%d:%d@%x,%x",

		dp, *vendor, *device,

		*intr, reg0);

}
@@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp) 
	tmp_buf[0] = '\0';

	__build_path_component(dp, tmp_buf);

	if (tmp_buf[0] == '\0')

		strcpy(tmp_buf, dp->name);

		snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp);



	n = prom_early_alloc(strlen(tmp_buf) + 1);

	strcpy(n, tmp_buf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE