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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 7054ec7f d9db950c

arch/arm/kernel/calls.S

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
		CALL(sys_statfs)

/* 100 */	CALL(sys_fstatfs)

		CALL(sys_ni_syscall)

		CALL(OBSOLETE(sys_socketcall))

		CALL(OBSOLETE(ABI(sys_socketcall, sys_oabi_socketcall)))

		CALL(sys_syslog)

		CALL(sys_setitimer)

/* 105 */	CALL(sys_getitimer)

arch/arm/kernel/setup.c

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/root_dev.h>

#include <linux/cpu.h>

#include <linux/interrupt.h>

#include <linux/smp.h>



#include <asm/cpu.h>

#include <asm/elf.h>
@@ -771,6 +772,10 @@ void __init setup_arch(char **cmdline_p) 
	paging_init(&meminfo, mdesc);

	request_standard_resources(&meminfo, mdesc);



#ifdef CONFIG_SMP

	smp_init_cpus();

#endif



	cpu_init();



	/*

arch/arm/kernel/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -338,7 +338,6 @@ void __init smp_prepare_boot_cpu(void) 


	per_cpu(cpu_data, cpu).idle = current;



	cpu_set(cpu, cpu_possible_map);

	cpu_set(cpu, cpu_present_map);

	cpu_set(cpu, cpu_online_map);

}

arch/arm/kernel/sys_oabi-compat.c

+30 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
 * sys_connect:

 * sys_sendmsg:

 * sys_sendto:

 * sys_socketcall:

 *

 *   struct sockaddr_un loses its padding with EABI.  Since the size of the

 *   structure is used as a validation test in unix_mkname(), we need to
@@ -78,6 +79,7 @@ 
#include <linux/eventpoll.h>

#include <linux/sem.h>

#include <linux/socket.h>

#include <linux/net.h>

#include <asm/ipc.h>

#include <asm/uaccess.h>
@@ -408,3 +410,31 @@ asmlinkage long sys_oabi_sendmsg(int fd, struct msghdr __user *msg, unsigned fla 
	return sys_sendmsg(fd, msg, flags);

}



asmlinkage long sys_oabi_socketcall(int call, unsigned long __user *args)

{

	unsigned long r = -EFAULT, a[6];



	switch (call) {

	case SYS_BIND:

		if (copy_from_user(a, args, 3 * sizeof(long)) == 0)

			r = sys_oabi_bind(a[0], (struct sockaddr __user *)a[1], a[2]);

		break;

	case SYS_CONNECT:

		if (copy_from_user(a, args, 3 * sizeof(long)) == 0)

			r = sys_oabi_connect(a[0], (struct sockaddr __user *)a[1], a[2]);

		break;

	case SYS_SENDTO:

		if (copy_from_user(a, args, 6 * sizeof(long)) == 0)

			r = sys_oabi_sendto(a[0], (void __user *)a[1], a[2], a[3],

					    (struct sockaddr __user *)a[4], a[5]);

		break;

	case SYS_SENDMSG:

		if (copy_from_user(a, args, 3 * sizeof(long)) == 0)

			r = sys_oabi_sendmsg(a[0], (struct msghdr __user *)a[1], a[2]);

		break;

	default:

		r = sys_socketcall(call, args);

	}



	return r;

}

arch/arm/mach-integrator/platsmp.c

+15 −6
Original line number Diff line number Diff line
@@ -140,6 +140,18 @@ static void __init poke_milo(void) 
	mb();

}



/*

 * Initialise the CPU possible map early - this describes the CPUs

 * which may be present or become present in the system.

 */

void __init smp_init_cpus(void)

{

	unsigned int i, ncores = get_core_count();



	for (i = 0; i < ncores; i++)

		cpu_set(i, cpu_possible_map);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = get_core_count();
@@ -176,14 +188,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
		max_cpus = ncores;



	/*

	 * Initialise the possible/present maps.

	 * cpu_possible_map describes the set of CPUs which may be present

	 * cpu_present_map describes the set of CPUs populated

	 * Initialise the present map, which describes the set of CPUs

	 * actually populated at the present time.

	 */

	for (i = 0; i < max_cpus; i++) {

		cpu_set(i, cpu_possible_map);

	for (i = 0; i < max_cpus; i++)

		cpu_set(i, cpu_present_map);

	}



	/*

	 * Do we need any more CPUs? If so, then let them know where