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

Commit 7971db5a authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

Merge branch 'for-rmk-misc' into for-rmk

parents d403700b c4edfced

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ config ARCH_MTD_XIP 
	bool



config GENERIC_HARDIRQS_NO__DO_IRQ

	bool

	def_bool y



if OPROFILE

arch/arm/configs/netx_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -728,9 +728,9 @@ CONFIG_RTC_CLASS=m 
#

# RTC interfaces

#

CONFIG_RTC_INTF_SYSFS=m

CONFIG_RTC_INTF_PROC=m

CONFIG_RTC_INTF_DEV=m

CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y



#

# RTC drivers

arch/arm/configs/picotux200_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -1069,9 +1069,9 @@ CONFIG_RTC_CLASS=m 
#

# RTC interfaces

#

CONFIG_RTC_INTF_SYSFS=m

CONFIG_RTC_INTF_PROC=m

CONFIG_RTC_INTF_DEV=m

CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y

# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set



#

arch/arm/include/asm/bitops.h

+10 −6
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset); 
#if __LINUX_ARM_ARCH__ < 5



#include <asm-generic/bitops/ffz.h>

#include <asm-generic/bitops/__fls.h>

#include <asm-generic/bitops/__ffs.h>

#include <asm-generic/bitops/fls.h>

#include <asm-generic/bitops/ffs.h>
@@ -277,16 +278,19 @@ static inline int constant_fls(int x) 
 * the clz instruction for much better code efficiency.

 */



#define __fls(x) \

	( __builtin_constant_p(x) ? constant_fls(x) : \

	  ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )



/* Implement fls() in C so that 64-bit args are suitably truncated */

static inline int fls(int x)

{

	return __fls(x);

	int ret;



	if (__builtin_constant_p(x))

	       return constant_fls(x);



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

       	ret = 32 - ret;

	return ret;

}



#define __fls(x) (fls(x) - 1)

#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })

#define __ffs(x) (ffs(x) - 1)

#define ffz(x) __ffs( ~(x) )

arch/arm/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/types.h>



#ifdef __KERNEL__

#define STACK_TOP	((current->personality == PER_LINUX_32BIT) ? \

#define STACK_TOP	((current->personality & ADDR_LIMIT_32BIT) ? \

			 TASK_SIZE : TASK_SIZE_26)

#define STACK_TOP_MAX	TASK_SIZE

#endif