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

Commit afdef69c 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:
  sparc32: Pass task_struct to schedule_tail() in ret_from_fork
  apbuart: Depend upon sparc.
  sparc64: Fix section mis-match errors.
  sparc32,leon: Fixed APBUART frequency detection
  sparc32, leon: APBUART driver must use archdata to get IRQ number
  sparc: Hook up syncfs system call.
parents 84daeb09 47c7c97a

arch/sparc/include/asm/unistd.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -403,8 +403,9 @@ 
#define __NR_name_to_handle_at	332

#define __NR_name_to_handle_at	332

#define __NR_open_by_handle_at	333

#define __NR_open_by_handle_at	333

#define __NR_clock_adjtime	334

#define __NR_clock_adjtime	334

#define __NR_syncfs		335





#define NR_syscalls		335

#define NR_syscalls		336





#ifdef __32bit_syscall_numbers__

#ifdef __32bit_syscall_numbers__

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

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

arch/sparc/kernel/auxio_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ void auxio_set_lte(int on) 
}

}

EXPORT_SYMBOL(auxio_set_lte);

EXPORT_SYMBOL(auxio_set_lte);





static struct of_device_id __initdata auxio_match[] = {

static const struct of_device_id auxio_match[] = {

	{

	{

		.name = "auxio",

		.name = "auxio",

	},

	},

arch/sparc/kernel/central.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ static int __devinit clock_board_probe(struct platform_device *op) 
	goto out;

	goto out;

}

}





static struct of_device_id __initdata clock_board_match[] = {

static const struct of_device_id clock_board_match[] = {

	{

	{

		.name = "clock-board",

		.name = "clock-board",

	},

	},
@@ -245,7 +245,7 @@ static int __devinit fhc_probe(struct platform_device *op) 
	goto out;

	goto out;

}

}





static struct of_device_id __initdata fhc_match[] = {

static const struct of_device_id fhc_match[] = {

	{

	{

		.name = "fhc",

		.name = "fhc",

	},

	},

arch/sparc/kernel/ds.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1218,7 +1218,7 @@ static int ds_remove(struct vio_dev *vdev) 
	return 0;

	return 0;

}

}





static struct vio_device_id __initdata ds_match[] = {

static const struct vio_device_id ds_match[] = {

	{

	{

		.type = "domain-services-port",

		.type = "domain-services-port",

	},

	},

arch/sparc/kernel/entry.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -1283,7 +1283,7 @@ linux_syscall_trace: 
	.globl	ret_from_fork

	.globl	ret_from_fork

ret_from_fork:

ret_from_fork:

	call	schedule_tail

	call	schedule_tail

	 mov	%g3, %o0

	 ld	[%g3 + TI_TASK], %o0

	b	ret_sys_call

	b	ret_sys_call

	 ld	[%sp + STACKFRAME_SZ + PT_I0], %o0

	 ld	[%sp + STACKFRAME_SZ + PT_I0], %o0