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

Commit 65e5d002 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: fix missing branch in __error_a
  ARM: fix /proc/$PID/stack on SMP
  ARM: Fix build regression on SA11x0, PXA, and H720x targets
  ARM: 6625/1: use memblock memory regions for "System RAM" I/O resources
  ARM: fix wrongly patched constants
  ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP
  ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S
  ARM: 6622/1: fix dma_unmap_sg() documentation
  ARM: 6621/1: bitops: remove condition code clobber for CLZ
  ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used
  ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU
  ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero
  ARM: sched_clock: allow init_sched_clock() to be called early
  ARM: integrator: fix compile warning in cpu.c
  ARM: 6616/1: Fix ep93xx-fb init/exit annotations
  ARM: twd: fix display of twd frequency
  ARM: udelay: prevent math rounding resulting in short udelays
parents 38567333 cb4d3eae

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ config SMP 
config SMP_ON_UP

	bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	depends on SMP && !XIP

	depends on SMP && !XIP_KERNEL

	default y

	help

	  SMP kernels contain instructions which fail on non-SMP processors.

arch/arm/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static inline int fls(int x) 
	if (__builtin_constant_p(x))

	       return constant_fls(x);



	asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc");

	asm("clz\t%0, %1" : "=r" (ret) : "r" (x));

       	ret = 32 - ret;

	return ret;

}

arch/arm/include/asm/sched_clock.h

+2 −0
Original line number Diff line number Diff line
@@ -115,4 +115,6 @@ static inline void init_fixed_sched_clock(struct clock_data *cd, 
	}

}



extern void sched_clock_postinit(void);



#endif

arch/arm/kernel/head-common.S

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ str_a1: .asciz "\nError: unrecognized/unsupported machine ID (r1 = 0x" 
str_a2:	.asciz	").\n\nAvailable machine support:\n\nID (hex)\tNAME\n"

str_a3:	.asciz	"\nPlease check your kernel config and/or bootloader.\n"

	.align

#else

	b	__error

#endif



/*

arch/arm/kernel/process.c

+2 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) 
	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;

}



#ifdef CONFIG_MMU

/*

 * The vectors page is always readable from user space for the

 * atomic helpers and the signal restart code.  Let's declare a mapping
@@ -503,3 +504,4 @@ const char *arch_vma_name(struct vm_area_struct *vma) 
{

	return (vma->vm_start == 0xffff0000) ? "[vectors]" : NULL;

}

#endif