Commit 367262c1 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Pull percpu updates from Tejun Heo:
 "Two trivial percpu patches for v4.5-rc1"

* 'for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: remove PERCPU_ENOUGH_ROOM which is stale definition
  percpu: Remove unneeded return from void function
parents 0f8c7901 18fc93fd
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
* David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
#define PERCPU_ENOUGH_ROOM PERCPU_PAGE_SIZE
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
# define THIS_CPU(var) (var) /* use this to mark accesses to per-CPU variables... */ # define THIS_CPU(var) (var) /* use this to mark accesses to per-CPU variables... */
#else /* !__ASSEMBLY__ */ #else /* !__ASSEMBLY__ */
......
...@@ -116,7 +116,7 @@ void percpu_ref_reinit(struct percpu_ref *ref); ...@@ -116,7 +116,7 @@ void percpu_ref_reinit(struct percpu_ref *ref);
*/ */
static inline void percpu_ref_kill(struct percpu_ref *ref) static inline void percpu_ref_kill(struct percpu_ref *ref)
{ {
return percpu_ref_kill_and_confirm(ref, NULL); percpu_ref_kill_and_confirm(ref, NULL);
} }
/* /*
......
...@@ -18,12 +18,6 @@ ...@@ -18,12 +18,6 @@
#define PERCPU_MODULE_RESERVE 0 #define PERCPU_MODULE_RESERVE 0
#endif #endif
#ifndef PERCPU_ENOUGH_ROOM
#define PERCPU_ENOUGH_ROOM \
(ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \
PERCPU_MODULE_RESERVE)
#endif
/* minimum unit size, also is the maximum supported allocation size */ /* minimum unit size, also is the maximum supported allocation size */
#define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10) #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment