Commit d528ae0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "6 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers core: remove assert_held_device_hotplug()
  mm: add private lock to serialize memory hotplug operations
  mm: don't warn when vmalloc() fails due to a fatal signal
  mm, x86: fix native_pud_clear build error
  kasan: add a prototype of task_struct to avoid warning
  z3fold: fix spinlock unlocking in page reclaim
parents d11507e1 15c9e10d

arch/x86/include/asm/pgtable-3level.h

+0 −3
Original line number Diff line number Diff line
@@ -121,12 +121,9 @@ static inline void native_pmd_clear(pmd_t *pmd) 
	*(tmp + 1) = 0;

}



#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \

		defined(CONFIG_PARAVIRT))

static inline void native_pud_clear(pud_t *pudp)

{

}

#endif



static inline void pud_clear(pud_t *pudp)

{

arch/x86/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); 
# define set_pud(pudp, pud)		native_set_pud(pudp, pud)

#endif



#ifndef __PAGETABLE_PMD_FOLDED

#ifndef __PAGETABLE_PUD_FOLDED

#define pud_clear(pud)			native_pud_clear(pud)

#endif

drivers/base/core.c

+0 −5
Original line number Diff line number Diff line
@@ -639,11 +639,6 @@ int lock_device_hotplug_sysfs(void) 
	return restart_syscall();

}



void assert_held_device_hotplug(void)

{

	lockdep_assert_held(&device_hotplug_lock);

}



#ifdef CONFIG_BLOCK

static inline int device_is_not_partition(struct device *dev)

{

include/linux/device.h

+0 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,6 @@ static inline bool device_supports_offline(struct device *dev) 
extern void lock_device_hotplug(void);

extern void unlock_device_hotplug(void);

extern int lock_device_hotplug_sysfs(void);

void assert_held_device_hotplug(void);

extern int device_offline(struct device *dev);

extern int device_online(struct device *dev);

extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode);

include/linux/kasan.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
struct kmem_cache;

struct page;

struct vm_struct;

struct task_struct;



#ifdef CONFIG_KASAN

CRA Git | Maintained and supported by SUSTech CRA and CCSE