Hi Kirill,

[auto build test ERROR on mmotm/master]
[also build test ERROR on v4.12-rc5 next-20170614]
[cannot apply to tip/x86/core]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Kirill-A-Shutemov/Do-not-loose-dirty-bit-on-THP-pages/20170615-115540
base:   git://git.cmpxchg.org/linux-mmotm.git master
config: i386-randconfig-x071-06130444 (attached as .config)
compiler: gcc-6 (Debian 6.3.0-18) 6.3.0 20170516
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All error/warnings (new ones prefixed by >>):

   In file included from include/linux/mm.h:70:0,
                    from include/linux/memcontrol.h:29,
                    from include/linux/swap.h:8,
                    from include/linux/suspend.h:4,
                    from arch/x86/kernel/asm-offsets.c:12:
>> arch/x86/include/asm/pgtable.h:1096:27: error: redefinition of 'pmdp_mknotpresent'
    #define pmdp_mknotpresent pmdp_mknotpresent
                              ^
>> arch/x86/include/asm/pgtable.h:1097:20: note: in expansion of macro 'pmdp_mknotpresent'
    static inline void pmdp_mknotpresent(pmd_t *pmdp)
                       ^~~~~~~~~~~~~~~~~
   In file included from arch/x86/include/asm/pgtable_32.h:43:0,
                    from arch/x86/include/asm/pgtable.h:604,
                    from include/linux/mm.h:70,
                    from include/linux/memcontrol.h:29,
                    from include/linux/swap.h:8,
                    from include/linux/suspend.h:4,
                    from arch/x86/kernel/asm-offsets.c:12:
   arch/x86/include/asm/pgtable-3level.h:194:20: note: previous definition of 'pmdp_mknotpresent' was here
    static inline void pmdp_mknotpresent(pmd_t *pmdp)
                       ^~~~~~~~~~~~~~~~~
   make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1
   make[2]: Target '__build' not remade because of errors.
   make[1]: *** [prepare0] Error 2
   make[1]: Target 'prepare' not remade because of errors.
   make: *** [sub-make] Error 2

vim +/pmdp_mknotpresent +1096 arch/x86/include/asm/pgtable.h

  1090					      unsigned long addr, pmd_t *pmdp)
  1091	{
  1092		clear_bit(_PAGE_BIT_RW, (unsigned long *)pmdp);
  1093	}
  1094	
  1095	#ifndef pmdp_mknotpresent
> 1096	#define pmdp_mknotpresent pmdp_mknotpresent
> 1097	static inline void pmdp_mknotpresent(pmd_t *pmdp)
  1098	{
  1099		pmd_t old, new;
  1100	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation