Merge branch 'akpm' (patches from Andrew)
Merge second patchbomb from Andrew Morton: - most of the rest of MM - lots of misc things - procfs updates - printk feature work - updates to get_maintainer, MAINTAINERS, checkpatch - lib/ updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits) exit,stats: /* obey this comment */ coredump: add __printf attribute to cn_*printf functions coredump: use from_kuid/kgid when formatting corename fs/reiserfs: remove unneeded cast NILFS2: support NFSv2 export fs/befs/btree.c: remove unneeded initializations fs/minix: remove unneeded cast init/do_mounts.c: add create_dev() failure log kasan: remove duplicate definition of the macro KASAN_FREE_PAGE fs/efs: femove unneeded cast checkpatch: emit "NOTE: <types>" message only once after multiple files checkpatch: emit an error when there's a diff in a changelog checkpatch: validate MODULE_LICENSE content checkpatch: add multi-line handling for PREFER_ETHER_ADDR_COPY checkpatch: suggest using eth_zero_addr() and eth_broadcast_addr() checkpatch: fix processing of MEMSET issues checkpatch: suggest using ether_addr_equal*() checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files checkpatch: remove local from codespell path checkpatch: add --showfile to allow input via pipe to show filenames ...
This commit is contained in:
Linus Torvalds
32
lib/bitmap.c
32
lib/bitmap.c
@@ -462,19 +462,20 @@ EXPORT_SYMBOL(bitmap_parse_user);
|
||||
* Output format is a comma-separated list of decimal numbers and
|
||||
* ranges if list is specified or hex digits grouped into comma-separated
|
||||
* sets of 8 digits/set. Returns the number of characters written to buf.
|
||||
*
|
||||
* It is assumed that @buf is a pointer into a PAGE_SIZE area and that
|
||||
* sufficient storage remains at @buf to accommodate the
|
||||
* bitmap_print_to_pagebuf() output.
|
||||
*/
|
||||
int bitmap_print_to_pagebuf(bool list, char *buf, const unsigned long *maskp,
|
||||
int nmaskbits)
|
||||
{
|
||||
ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf - 2;
|
||||
ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf;
|
||||
int n = 0;
|
||||
|
||||
if (len > 1) {
|
||||
n = list ? scnprintf(buf, len, "%*pbl", nmaskbits, maskp) :
|
||||
scnprintf(buf, len, "%*pb", nmaskbits, maskp);
|
||||
buf[n++] = '\n';
|
||||
buf[n] = '\0';
|
||||
}
|
||||
if (len > 1)
|
||||
n = list ? scnprintf(buf, len, "%*pbl\n", nmaskbits, maskp) :
|
||||
scnprintf(buf, len, "%*pb\n", nmaskbits, maskp);
|
||||
return n;
|
||||
}
|
||||
EXPORT_SYMBOL(bitmap_print_to_pagebuf);
|
||||
@@ -506,12 +507,12 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
|
||||
unsigned a, b;
|
||||
int c, old_c, totaldigits;
|
||||
const char __user __force *ubuf = (const char __user __force *)buf;
|
||||
int exp_digit, in_range;
|
||||
int at_start, in_range;
|
||||
|
||||
totaldigits = c = 0;
|
||||
bitmap_zero(maskp, nmaskbits);
|
||||
do {
|
||||
exp_digit = 1;
|
||||
at_start = 1;
|
||||
in_range = 0;
|
||||
a = b = 0;
|
||||
|
||||
@@ -540,11 +541,10 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
|
||||
break;
|
||||
|
||||
if (c == '-') {
|
||||
if (exp_digit || in_range)
|
||||
if (at_start || in_range)
|
||||
return -EINVAL;
|
||||
b = 0;
|
||||
in_range = 1;
|
||||
exp_digit = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -554,16 +554,18 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
|
||||
b = b * 10 + (c - '0');
|
||||
if (!in_range)
|
||||
a = b;
|
||||
exp_digit = 0;
|
||||
at_start = 0;
|
||||
totaldigits++;
|
||||
}
|
||||
if (!(a <= b))
|
||||
return -EINVAL;
|
||||
if (b >= nmaskbits)
|
||||
return -ERANGE;
|
||||
while (a <= b) {
|
||||
set_bit(a, maskp);
|
||||
a++;
|
||||
if (!at_start) {
|
||||
while (a <= b) {
|
||||
set_bit(a, maskp);
|
||||
a++;
|
||||
}
|
||||
}
|
||||
} while (buflen && c == ',');
|
||||
return 0;
|
||||
|
||||
@@ -257,23 +257,20 @@ static int kobject_add_internal(struct kobject *kobj)
|
||||
int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
|
||||
va_list vargs)
|
||||
{
|
||||
const char *old_name = kobj->name;
|
||||
char *s;
|
||||
|
||||
if (kobj->name && !fmt)
|
||||
return 0;
|
||||
|
||||
kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
|
||||
if (!kobj->name) {
|
||||
kobj->name = old_name;
|
||||
s = kvasprintf(GFP_KERNEL, fmt, vargs);
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/* ewww... some of these buggers have '/' in the name ... */
|
||||
while ((s = strchr(kobj->name, '/')))
|
||||
s[0] = '!';
|
||||
strreplace(s, '/', '!');
|
||||
kfree(kobj->name);
|
||||
kobj->name = s;
|
||||
|
||||
kfree(old_name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,8 @@ static struct kmem_cache *radix_tree_node_cachep;
|
||||
*/
|
||||
struct radix_tree_preload {
|
||||
int nr;
|
||||
struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
|
||||
/* nodes->private_data points to next preallocated node */
|
||||
struct radix_tree_node *nodes;
|
||||
};
|
||||
static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
|
||||
|
||||
@@ -197,8 +198,9 @@ radix_tree_node_alloc(struct radix_tree_root *root)
|
||||
*/
|
||||
rtp = this_cpu_ptr(&radix_tree_preloads);
|
||||
if (rtp->nr) {
|
||||
ret = rtp->nodes[rtp->nr - 1];
|
||||
rtp->nodes[rtp->nr - 1] = NULL;
|
||||
ret = rtp->nodes;
|
||||
rtp->nodes = ret->private_data;
|
||||
ret->private_data = NULL;
|
||||
rtp->nr--;
|
||||
}
|
||||
/*
|
||||
@@ -257,17 +259,20 @@ static int __radix_tree_preload(gfp_t gfp_mask)
|
||||
|
||||
preempt_disable();
|
||||
rtp = this_cpu_ptr(&radix_tree_preloads);
|
||||
while (rtp->nr < ARRAY_SIZE(rtp->nodes)) {
|
||||
while (rtp->nr < RADIX_TREE_PRELOAD_SIZE) {
|
||||
preempt_enable();
|
||||
node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
|
||||
if (node == NULL)
|
||||
goto out;
|
||||
preempt_disable();
|
||||
rtp = this_cpu_ptr(&radix_tree_preloads);
|
||||
if (rtp->nr < ARRAY_SIZE(rtp->nodes))
|
||||
rtp->nodes[rtp->nr++] = node;
|
||||
else
|
||||
if (rtp->nr < RADIX_TREE_PRELOAD_SIZE) {
|
||||
node->private_data = rtp->nodes;
|
||||
rtp->nodes = node;
|
||||
rtp->nr++;
|
||||
} else {
|
||||
kmem_cache_free(radix_tree_node_cachep, node);
|
||||
}
|
||||
}
|
||||
ret = 0;
|
||||
out:
|
||||
@@ -1463,15 +1468,16 @@ static int radix_tree_callback(struct notifier_block *nfb,
|
||||
{
|
||||
int cpu = (long)hcpu;
|
||||
struct radix_tree_preload *rtp;
|
||||
struct radix_tree_node *node;
|
||||
|
||||
/* Free per-cpu pool of perloaded nodes */
|
||||
if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
|
||||
rtp = &per_cpu(radix_tree_preloads, cpu);
|
||||
while (rtp->nr) {
|
||||
kmem_cache_free(radix_tree_node_cachep,
|
||||
rtp->nodes[rtp->nr-1]);
|
||||
rtp->nodes[rtp->nr-1] = NULL;
|
||||
rtp->nr--;
|
||||
node = rtp->nodes;
|
||||
rtp->nodes = node->private_data;
|
||||
kmem_cache_free(radix_tree_node_cachep, node);
|
||||
rtp->nr--;
|
||||
}
|
||||
}
|
||||
return NOTIFY_OK;
|
||||
|
||||
23
lib/sort.c
23
lib/sort.c
@@ -8,6 +8,12 @@
|
||||
#include <linux/export.h>
|
||||
#include <linux/sort.h>
|
||||
|
||||
static int alignment_ok(const void *base, int align)
|
||||
{
|
||||
return IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ||
|
||||
((unsigned long)base & (align - 1)) == 0;
|
||||
}
|
||||
|
||||
static void u32_swap(void *a, void *b, int size)
|
||||
{
|
||||
u32 t = *(u32 *)a;
|
||||
@@ -15,6 +21,13 @@ static void u32_swap(void *a, void *b, int size)
|
||||
*(u32 *)b = t;
|
||||
}
|
||||
|
||||
static void u64_swap(void *a, void *b, int size)
|
||||
{
|
||||
u64 t = *(u64 *)a;
|
||||
*(u64 *)a = *(u64 *)b;
|
||||
*(u64 *)b = t;
|
||||
}
|
||||
|
||||
static void generic_swap(void *a, void *b, int size)
|
||||
{
|
||||
char t;
|
||||
@@ -50,8 +63,14 @@ void sort(void *base, size_t num, size_t size,
|
||||
/* pre-scale counters for performance */
|
||||
int i = (num/2 - 1) * size, n = num * size, c, r;
|
||||
|
||||
if (!swap_func)
|
||||
swap_func = (size == 4 ? u32_swap : generic_swap);
|
||||
if (!swap_func) {
|
||||
if (size == 4 && alignment_ok(base, 4))
|
||||
swap_func = u32_swap;
|
||||
else if (size == 8 && alignment_ok(base, 8))
|
||||
swap_func = u64_swap;
|
||||
else
|
||||
swap_func = generic_swap;
|
||||
}
|
||||
|
||||
/* heapify */
|
||||
for ( ; i >= 0; i -= size) {
|
||||
|
||||
17
lib/string.c
17
lib/string.c
@@ -849,3 +849,20 @@ void *memchr_inv(const void *start, int c, size_t bytes)
|
||||
return check_bytes8(start, value, bytes % 8);
|
||||
}
|
||||
EXPORT_SYMBOL(memchr_inv);
|
||||
|
||||
/**
|
||||
* strreplace - Replace all occurrences of character in string.
|
||||
* @s: The string to operate on.
|
||||
* @old: The character being replaced.
|
||||
* @new: The character @old is replaced with.
|
||||
*
|
||||
* Returns pointer to the nul byte at the end of @s.
|
||||
*/
|
||||
char *strreplace(char *s, char old, char new)
|
||||
{
|
||||
for (; *s; ++s)
|
||||
if (*s == old)
|
||||
*s = new;
|
||||
return s;
|
||||
}
|
||||
EXPORT_SYMBOL(strreplace);
|
||||
|
||||
@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
|
||||
"4c", "d1", "19", "99", "43", "b1", "af", "0c",
|
||||
};
|
||||
|
||||
static const char *test_data_2_le[] __initdata = {
|
||||
static const char * const test_data_2_le[] __initconst = {
|
||||
"32be", "7bdb", "180a", "b293",
|
||||
"ba70", "24c4", "837d", "9b34",
|
||||
"9ca6", "ad31", "0f9c", "e9ac",
|
||||
"d14c", "9919", "b143", "0caf",
|
||||
};
|
||||
|
||||
static const char *test_data_4_le[] __initdata = {
|
||||
static const char * const test_data_4_le[] __initconst = {
|
||||
"7bdb32be", "b293180a", "24c4ba70", "9b34837d",
|
||||
"ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
|
||||
};
|
||||
|
||||
static const char *test_data_8_le[] __initdata = {
|
||||
static const char * const test_data_8_le[] __initconst = {
|
||||
"b293180a7bdb32be", "9b34837d24c4ba70",
|
||||
"e9ac0f9cad319ca6", "0cafb1439919d14c",
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user