diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
| commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
| tree | 3c688483e71261f564fc43be3157b337ae340dca /include/linux/cpumask.h | |
| parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/linux/cpumask.h')
| -rw-r--r-- | include/linux/cpumask.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 9650806fe2ea..5df3db58fcc6 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h | |||
| @@ -289,13 +289,6 @@ static inline int __cpumask_scnprintf(char *buf, int len, | |||
| 289 | return bitmap_scnprintf(buf, len, srcp->bits, nbits); | 289 | return bitmap_scnprintf(buf, len, srcp->bits, nbits); |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | #define cpumask_scnprintf_len(len) \ | ||
| 293 | __cpumask_scnprintf_len((len)) | ||
| 294 | static inline int __cpumask_scnprintf_len(int len) | ||
| 295 | { | ||
| 296 | return bitmap_scnprintf_len(len); | ||
| 297 | } | ||
| 298 | |||
| 299 | #define cpumask_parse_user(ubuf, ulen, dst) \ | 292 | #define cpumask_parse_user(ubuf, ulen, dst) \ |
| 300 | __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) | 293 | __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) |
| 301 | static inline int __cpumask_parse_user(const char __user *buf, int len, | 294 | static inline int __cpumask_parse_user(const char __user *buf, int len, |