Merge branch 'master' into percpu
This commit is contained in:
@@ -1269,7 +1269,7 @@ static void pcpu_reclaim(struct work_struct *work)
|
||||
*/
|
||||
void free_percpu(void *ptr)
|
||||
{
|
||||
void *addr = __pcpu_ptr_to_addr(ptr);
|
||||
void *addr;
|
||||
struct pcpu_chunk *chunk;
|
||||
unsigned long flags;
|
||||
int off;
|
||||
@@ -1277,6 +1277,8 @@ void free_percpu(void *ptr)
|
||||
if (!ptr)
|
||||
return;
|
||||
|
||||
addr = __pcpu_ptr_to_addr(ptr);
|
||||
|
||||
spin_lock_irqsave(&pcpu_lock, flags);
|
||||
|
||||
chunk = pcpu_chunk_addr_search(addr);
|
||||
|
Reference in New Issue
Block a user