aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-12-08 05:37:51 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:51 -0500
commit312a0c170945b49f319960afd2e492c05f9dd551 (patch)
treef3c122cc65d18bc647b45d89b3a8d0fb8492422b /include/linux/kernel.h
parentf0d1b0b30d250a07627ad8b9fbbb5c7cc08422e8 (diff)
[PATCH] LOG2: Alter roundup_pow_of_two() so that it can use a ilog2() on a constant
Alter roundup_pow_of_two() so that it can make use of ilog2() on a constant to produce a constant value, retaining the ability for an arch to override it in the non-const case. This permits the function to be used to initialise variables. Signed-off-by: David Howells <dhowells@redhat.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 3710cce16642..e8bfac34d2ba 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -158,12 +158,6 @@ static inline int printk(const char *s, ...) { return 0; }
158 158
159unsigned long int_sqrt(unsigned long); 159unsigned long int_sqrt(unsigned long);
160 160
161static inline unsigned long
162__attribute_const__ roundup_pow_of_two(unsigned long x)
163{
164 return 1UL << fls_long(x - 1);
165}
166
167extern int printk_ratelimit(void); 161extern int printk_ratelimit(void);
168extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst); 162extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);
169extern bool printk_timed_ratelimit(unsigned long *caller_jiffies, 163extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,