Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f1f3e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sparc updates from David Miller:

 - Automatic system call table generation, from Firoz Khan.

 - Clean up accesses to the OF device names by using full_name instead
   of path_component_name.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  ALSA: sparc: Use of_node_name_eq for node name comparisons
  sbus: Use of_node_name_eq for node name comparisons
  sparc: generate uapi header and system call table files
  sparc: add system call table generation support
  sparc: add __NR_syscalls along with NR_syscalls
  sparc: move __IGNORE* entries to non uapi header
  sparc: Use DT node full_name instead of name for resources
  sparc: Remove unused leon_trans_init
  sparc: Use device_type helpers to access the node type
  sparc: Use of_node_name_eq for node name comparisons
  sparc: Convert to using %pOFn instead of device_node.name
  sparc: prom: use property "name" directly to construct node names
  of: Drop full path from full_name for PDT systems
  sparc: Convert to using %pOF instead of full_name
  fs/openpromfs: Use of_node_name_eq for node name comparisons
  fs/openpromfs: use full_name instead of path_component_name
parents 9830afca c23b8e7a

arch/sparc/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ install: 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



archheaders:

	$(Q)$(MAKE) $(build)=arch/sparc/kernel/syscalls all



PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/sparc/vdso $@

arch/sparc/include/asm/Kbuild

+3 −1
Original line number Diff line number Diff line 
# User exported sparc header files





generated-y += syscall_table_32.h

generated-y += syscall_table_64.h

generated-y += syscall_table_c32.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += exec.h

arch/sparc/include/asm/floppy_64.h

+4 −4
Original line number Diff line number Diff line
@@ -528,9 +528,9 @@ static int sun_pci_fd_test_drive(unsigned long port, int drive) 


static int __init ebus_fdthree_p(struct device_node *dp)

{

	if (!strcmp(dp->name, "fdthree"))

	if (of_node_name_eq(dp, "fdthree"))

		return 1;

	if (!strcmp(dp->name, "floppy")) {

	if (of_node_name_eq(dp, "floppy")) {

		const char *compat;



		compat = of_get_property(dp, "compatible", NULL);
@@ -555,7 +555,7 @@ static unsigned long __init sun_floppy_init(void) 
	op = NULL;



	for_each_node_by_name(dp, "SUNW,fdtwo") {

		if (strcmp(dp->parent->name, "sbus"))

		if (!of_node_name_eq(dp->parent, "sbus"))

			continue;

		op = of_find_device_by_node(dp);

		if (op)
@@ -656,7 +656,7 @@ static unsigned long __init sun_floppy_init(void) 
		 */

		config = 0;

		for (dp = ebus_dp->child; dp; dp = dp->sibling) {

			if (!strcmp(dp->name, "ecpp")) {

			if (of_node_name_eq(dp, "ecpp")) {

				struct platform_device *ecpp_op;



				ecpp_op = of_find_device_by_node(dp);

arch/sparc/include/asm/leon.h

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ void leon_update_virq_handling(unsigned int virq, 
			       irq_flow_handler_t flow_handler,

			       const char *name, int do_ack);

void leon_init_timers(void);

void leon_trans_init(struct device_node *dp);

void leon_node_init(struct device_node *dp, struct device_node ***nextp);

void init_leon(void);

void poke_leonsparc(void);

arch/sparc/include/asm/parport.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int ecpp_probe(struct platform_device *op) 
	int slot, err;



	parent = op->dev.of_node->parent;

	if (!strcmp(parent->name, "dma")) {

	if (of_node_name_eq(parent, "dma")) {

		p = parport_pc_probe_port(base, base + 0x400,

					  op->archdata.irqs[0], PARPORT_DMA_NOFIFO,

					  op->dev.parent->parent, 0);