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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Add {open_by,name_to}_handle_at and clock_adjtime syscalls.
  sparc: Implement of_iomap().
  sparc: Implement of_address_to_resource().
  sparc: Provide NO_IRQ definition.
parents 111f4268 b3f80f6d

arch/sparc/include/asm/irq_32.h

+3 −0
Original line number Diff line number Diff line
@@ -13,4 +13,7 @@ 
#define irq_canonicalize(irq)	(irq)



extern void __init init_IRQ(void);



#define NO_IRQ		0xffffffff



#endif

arch/sparc/include/asm/irq_64.h

+2 −0
Original line number Diff line number Diff line
@@ -97,4 +97,6 @@ extern void *softirq_stack[NR_CPUS]; 
#define __ARCH_HAS_DO_SOFTIRQ

#define ARCH_HAS_NMI_WATCHDOG



#define NO_IRQ		0xffffffff



#endif

arch/sparc/include/asm/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -400,8 +400,11 @@ 
#define __NR_fanotify_init	329

#define __NR_fanotify_mark	330

#define __NR_prlimit64		331

#define __NR_name_to_handle_at	332

#define __NR_open_by_handle_at	333

#define __NR_clock_adjtime	334



#define NR_syscalls		332

#define NR_syscalls		335



#ifdef __32bit_syscall_numbers__

/* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,

arch/sparc/kernel/of_device_common.c

+27 −0
Original line number Diff line number Diff line
@@ -22,6 +22,33 @@ unsigned int irq_of_parse_and_map(struct device_node *node, int index) 
}

EXPORT_SYMBOL(irq_of_parse_and_map);



int of_address_to_resource(struct device_node *node, int index,

			   struct resource *r)

{

	struct platform_device *op = of_find_device_by_node(node);



	if (!op || index >= op->num_resources)

		return -EINVAL;



	memcpy(r, &op->archdata.resource[index], sizeof(*r));

	return 0;

}

EXPORT_SYMBOL_GPL(of_address_to_resource);



void __iomem *of_iomap(struct device_node *node, int index)

{

	struct platform_device *op = of_find_device_by_node(node);

	struct resource *r;



	if (!op || index >= op->num_resources)

		return NULL;



	r = &op->archdata.resource[index];



	return of_ioremap(r, 0, resource_size(r), (char *) r->name);

}

EXPORT_SYMBOL(of_iomap);



/* Take the archdata values for IOMMU, STC, and HOSTDATA found in

 * BUS and propagate to all child platform_device objects.

 */

arch/sparc/kernel/systbls_32.S

+1 −1
Original line number Diff line number Diff line
@@ -83,5 +83,5 @@ sys_call_table: 
/*315*/	.long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1

/*320*/	.long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv

/*325*/	.long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init

/*330*/	.long sys_fanotify_mark, sys_prlimit64

/*330*/	.long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime