diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-16 22:13:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-16 22:13:50 -0700 |
| commit | a66d8962f27e1f5c2fd1f765a2ae9afa1e8eb6b4 (patch) | |
| tree | 3028e94f99824180626f9fbfb6e5a66f551641e1 /include/linux | |
| parent | 14ca49a1a44c4c07b8040fcfdb9671d21d5df06d (diff) | |
| parent | f25fed271059c7a4afe6db46f085e80e2c4db073 (diff) | |
Merge "Merge android-4.4.160 (a94efb1) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/ina2xx.h | 2 | ||||
| -rw-r--r-- | include/linux/slub_def.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/platform_data/ina2xx.h b/include/linux/platform_data/ina2xx.h index 9abc0ca7259b..9f0aa1b48c78 100644 --- a/include/linux/platform_data/ina2xx.h +++ b/include/linux/platform_data/ina2xx.h @@ -1,7 +1,7 @@ /* * Driver for Texas Instruments INA219, INA226 power monitor chips * - * Copyright (C) 2012 Lothar Felten <l-felten@ti.com> + * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index fd720e3dd1b8..fb7b94a1e2ca 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -67,7 +67,8 @@ struct kmem_cache { int size; /* The size of an object including meta data */ int object_size; /* The size of an object without meta data */ int offset; /* Free pointer offset. */ - int cpu_partial; /* Number of per cpu partial objects to keep around */ + /* Number of per cpu partial objects to keep around */ + unsigned int cpu_partial; struct kmem_cache_order_objects oo; /* Allocation and freeing of slabs */ |