From 434d18cb3554dcef33c2a44d4ca54814b56ba862 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 21 Jun 2012 11:48:11 +0200 Subject: [PATCH] --- yaml --- r: 311252 b: refs/heads/master c: 593f47355467b9ef44293698817e2bdb347e2d11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/dma-mapping.c | 2 +- trunk/include/asm-generic/bug.h | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 15e67f5c7506..c3adaf209c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09682c1dd3820445a27d32dcbeee6a6eafff3dc9 +refs/heads/master: 593f47355467b9ef44293698817e2bdb347e2d11 diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c index d766e4256b74..4044abcf6f9d 100644 --- a/trunk/arch/arm/mm/dma-mapping.c +++ b/trunk/arch/arm/mm/dma-mapping.c @@ -1067,7 +1067,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, gfp_t return NULL; while (count) { - int j, order = __ffs(count); + int j, order = __fls(count); pages[i] = alloc_pages(gfp | __GFP_NOWARN, order); while (!pages[i] && order) diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h index 7d10f962aa13..506ec19a3736 100644 --- a/trunk/include/asm-generic/bug.h +++ b/trunk/include/asm-generic/bug.h @@ -3,18 +3,10 @@ #include -#ifdef CONFIG_GENERIC_BUG -#define BUGFLAG_WARNING (1 << 0) -#define BUGFLAG_TAINT(taint) (BUGFLAG_WARNING | ((taint) << 8)) -#define BUG_GET_TAINT(bug) ((bug)->flags >> 8) -#endif - -#ifndef __ASSEMBLY__ -#include - #ifdef CONFIG_BUG #ifdef CONFIG_GENERIC_BUG +#ifndef __ASSEMBLY__ struct bug_entry { #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS unsigned long bug_addr; @@ -31,8 +23,17 @@ struct bug_entry { #endif unsigned short flags; }; +#endif /* __ASSEMBLY__ */ + +#define BUGFLAG_WARNING (1 << 0) +#define BUGFLAG_TAINT(taint) (BUGFLAG_WARNING | ((taint) << 8)) +#define BUG_GET_TAINT(bug) ((bug)->flags >> 8) + #endif /* CONFIG_GENERIC_BUG */ +#ifndef __ASSEMBLY__ +#include + /* * Don't use BUG() or BUG_ON() unless there's really no way out; one * example might be detecting data structure corruption in the middle