Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753926Ab2KQAa2 (ORCPT ); Fri, 16 Nov 2012 19:30:28 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:51965 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753832Ab2KQAa1 convert rfc822-to-8bit (ORCPT ); Fri, 16 Nov 2012 19:30:27 -0500 MIME-Version: 1.0 In-Reply-To: References: <20121116215244.8521.31505.stgit@ahduyck-cp1.jf.intel.com> Date: Fri, 16 Nov 2012 16:30:25 -0800 X-Google-Sender-Auth: Rq-5-S_VHSwhbcr-pV-vv1Q-5yA Message-ID: Subject: Re: [tip:x86/mm] x86: Move some contents of page_64_types.h into pgtable_64.h and page_64.h From: Yinghai Lu To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, alexander.h.duyck@intel.com, tglx@linutronix.de, hpa@linux.intel.com Cc: linux-tip-commits@vger.kernel.org Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4469 Lines: 118 On Fri, Nov 16, 2012 at 4:22 PM, tip-bot for Alexander Duyck wrote: > Commit-ID: 66d61384e9b4087f044ce86cb4adb12fe4623a6b > Gitweb: http://git.kernel.org/tip/66d61384e9b4087f044ce86cb4adb12fe4623a6b > Author: Alexander Duyck > AuthorDate: Fri, 16 Nov 2012 13:53:09 -0800 > Committer: H. Peter Anvin > CommitDate: Fri, 16 Nov 2012 15:20:10 -0800 > > x86: Move some contents of page_64_types.h into pgtable_64.h and page_64.h > > This patch is meant to clean-up the fact that we have several functions in > page_64_types.h which really don't belong there. I found this issue when I > had tried to replace __phys_addr with an inline function. It resulted in the > realmode bits generating compile warnings about types. In order to resolve > that I am relocating the address translation to page_64.h since this is in > keeping with where these functions are located in 32 bit. > > In addtion I have relocated several functions defined in init_64.c to > pgtable_64.h as this seems to be where most of the functions related to > memory initialization were already located. > > Signed-off-by: Alexander Duyck > Link: http://lkml.kernel.org/r/20121116215244.8521.31505.stgit@ahduyck-cp1.jf.intel.com > Signed-off-by: H. Peter Anvin > --- > arch/x86/include/asm/page_64.h | 19 +++++++++++++++++++ > arch/x86/include/asm/page_64_types.h | 22 ---------------------- > arch/x86/include/asm/pgtable_64.h | 5 +++++ > 3 files changed, 24 insertions(+), 22 deletions(-) > > diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h > index 072694e..4150999 100644 > --- a/arch/x86/include/asm/page_64.h > +++ b/arch/x86/include/asm/page_64.h > @@ -3,4 +3,23 @@ > > #include > > +#ifndef __ASSEMBLY__ > + > +/* duplicated to the one in bootmem.h */ > +extern unsigned long max_pfn; > +extern unsigned long phys_base; > + > +extern unsigned long __phys_addr(unsigned long); > + > +#define __phys_reloc_hide(x) (x) > + > +#ifdef CONFIG_FLATMEM > +#define pfn_valid(pfn) ((pfn) < max_pfn) > +#endif > + > +void clear_page(void *page); > +void copy_page(void *to, void *from); > + > +#endif /* !__ASSEMBLY__ */ > + > #endif /* _ASM_X86_PAGE_64_H */ > diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h > index 320f7bb..8b491e6 100644 > --- a/arch/x86/include/asm/page_64_types.h > +++ b/arch/x86/include/asm/page_64_types.h > @@ -50,26 +50,4 @@ > #define KERNEL_IMAGE_SIZE (512 * 1024 * 1024) > #define KERNEL_IMAGE_START _AC(0xffffffff80000000, UL) > > -#ifndef __ASSEMBLY__ > -void clear_page(void *page); > -void copy_page(void *to, void *from); > - > -/* duplicated to the one in bootmem.h */ > -extern unsigned long max_pfn; > -extern unsigned long phys_base; > - > -extern unsigned long __phys_addr(unsigned long); > -#define __phys_reloc_hide(x) (x) > - > -#define vmemmap ((struct page *)VMEMMAP_START) > - > -extern void init_extra_mapping_uc(unsigned long phys, unsigned long size); > -extern void init_extra_mapping_wb(unsigned long phys, unsigned long size); > - > -#endif /* !__ASSEMBLY__ */ > - > -#ifdef CONFIG_FLATMEM > -#define pfn_valid(pfn) ((pfn) < max_pfn) > -#endif > - > #endif /* _ASM_X86_PAGE_64_DEFS_H */ > diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h > index 47356f9..b5d30ad 100644 > --- a/arch/x86/include/asm/pgtable_64.h > +++ b/arch/x86/include/asm/pgtable_64.h > @@ -183,6 +183,11 @@ extern void cleanup_highmap(void); > > #define __HAVE_ARCH_PTE_SAME > > +#define vmemmap ((struct page *)VMEMMAP_START) > + > +extern void init_extra_mapping_uc(unsigned long phys, unsigned long size); > +extern void init_extra_mapping_wb(unsigned long phys, unsigned long size); > + > #endif /* !__ASSEMBLY__ */ > > #endif /* _ASM_X86_PGTABLE_64_H */ > -- arch/x86/kernel/apic/apic_numachip.c: In function ?map_csrs?: arch/x86/kernel/apic/apic_numachip.c:158:2: error: implicit declaration of function ?init_extra_mapping_uc? [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/