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

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4264/1: ldrex/strex syntax errors with recent compilers
  [ARM] Fix breakage caused by 72486f1f
parents 511b00a3 0803c30c

arch/arm/kernel/setup.c

+5 −2
Original line number Diff line number Diff line
@@ -839,8 +839,11 @@ static int __init topology_init(void) 
{

	int cpu;



	for_each_possible_cpu(cpu)

		register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu);

	for_each_possible_cpu(cpu) {

		struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu);

		cpuinfo->cpu.hotpluggable = 1;

		register_cpu(&cpuinfo->cpu, cpu);

	}



	return 0;

}

include/asm-arm/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) 
	unsigned long tmp, tmp2;



	__asm__ __volatile__("@ atomic_clear_mask\n"

"1:	ldrex	%0, %2\n"

"1:	ldrex	%0, [%2]\n"

"	bic	%0, %0, %3\n"

"	strex	%1, %0, %2\n"

"	strex	%1, %0, [%2]\n"

"	teq	%1, #0\n"

"	bne	1b"

	: "=&r" (tmp), "=&r" (tmp2)