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

Commit 1e1c568d authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge' into next

parents 91cac623 23e0e8af

Documentation/local_ops.txt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) 
	int cpu;



	/* Increment the counters */

	on_each_cpu(test_each, NULL, 0, 1);

	on_each_cpu(test_each, NULL, 1);

	/* Read all the counters */

	printk("Counters read from CPU %d\n", smp_processor_id());

	for_each_online_cpu(cpu) {

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3759,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx 
L:	sdhci-devel@list.drzeus.cx

S:	Maintained



SECURITY SUBSYSTEM

F:	security/

P:	James Morris

M:	jmorris@namei.org

L:	linux-kernel@vger.kernel.org

L:	linux-security-module@vger.kernel.org (suggested Cc:)

T:	git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git

S:	Supported



SECURITY CONTACT

P:	Security Officers

M:	security@kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 28

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

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