Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1522031 > unrolled thread

[PATCH] x86: setup_percpu: remove unnecessary include of module.h, add asm/desc.h

Back to article view | Back to linux.kernel

Contents

  [PATCH] x86: setup_percpu: remove unnecessary include of module.h, add asm/desc.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-11-14 20:10 +0100
    [tip:x86/headers] x86/percpu: Remove unnecessary include of  module.h, add asm/desc.h tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2016-11-15 12:00 +0100

#1522031 — [PATCH] x86: setup_percpu: remove unnecessary include of module.h, add asm/desc.h

This was originally a part of commit 186f43608a5c:

    ("x86/kernel: Audit and remove any unnecessary uses of module.h")

...but without the asm/desc.h addition.  As such, Ingo reported a
build failure on i386 allnoconfig with SMP=y during his pre-merge
testing.   For expediency the chunk was just dropped at that time.

The failure was as follows:

arch/x86/kernel/setup_percpu.c: In function ‘setup_percpu_segment’:
arch/x86/kernel/setup_percpu.c:159:2: error: implicit declaration of function
‘pack_descriptor’ [-Werror=implicit-function-declaration]

arch/x86/kernel/setup_percpu.c:162:2: error: implicit declaration of function
‘write_gdt_entry’ [-Werror=implicit-function-declaration]

arch/x86/kernel/setup_percpu.c:162:18: error: implicit declaration of function
‘get_cpu_gdt_table’ [-Werror=implicit-function-declaration]

As pack_descriptor, write_gdt_entry and get_cpu_gdt_table all live in the
file arch/x86/include/asm/desc.h -- calling that header out explicitly
should fix things.

Reported-by: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[build tested on -next with various configs ; hopefully all sane now.]

 arch/x86/kernel/setup_percpu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 8ce03678166e..42c3290e7c79 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -1,7 +1,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/percpu.h>
@@ -12,6 +12,7 @@
 #include <linux/pfn.h>
 #include <asm/sections.h>
 #include <asm/processor.h>
+#include <asm/desc.h>
 #include <asm/setup.h>
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>
-- 
2.8.4

[toc] | [next] | [standalone]

#1522573 — [tip:x86/headers] x86/percpu: Remove unnecessary include of module.h, add asm/desc.h

Commit-ID:  523d0fb4f05dcefed59c6325acb54adc34ee4c2d
Gitweb:     http://git.kernel.org/tip/523d0fb4f05dcefed59c6325acb54adc34ee4c2d
Author:     Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Mon, 14 Nov 2016 14:04:43 -0500
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 15 Nov 2016 07:26:37 +0100

x86/percpu: Remove unnecessary include of module.h, add asm/desc.h

This was originally a part of commit 186f43608a5c:

    ("x86/kernel: Audit and remove any unnecessary uses of module.h")

...but without the asm/desc.h addition.  As such, Ingo reported a
build failure on i386 allnoconfig with SMP=y during his pre-merge
testing.   For expediency the chunk was just dropped at that time.

The failure was as follows:

  arch/x86/kernel/setup_percpu.c: In function ‘setup_percpu_segment’:
  arch/x86/kernel/setup_percpu.c:159:2: error: implicit declaration of function ‘pack_descriptor’ [-Werror=implicit-function-declaration]
  arch/x86/kernel/setup_percpu.c:162:2: error: implicit declaration of function ‘write_gdt_entry’ [-Werror=implicit-function-declaration]
  arch/x86/kernel/setup_percpu.c:162:18: error: implicit declaration of function ‘get_cpu_gdt_table’ [-Werror=implicit-function-declaration]

As pack_descriptor(), write_gdt_entry() and get_cpu_gdt_table() all
live in the file arch/x86/include/asm/desc.h -- calling that header
out explicitly should fix things.

Reported-by: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161114190443.10873-1-paul.gortmaker@windriver.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/setup_percpu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 2bbd27f..9820d6d 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -1,7 +1,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/percpu.h>
@@ -12,6 +12,7 @@
 #include <linux/pfn.h>
 #include <asm/sections.h>
 #include <asm/processor.h>
+#include <asm/desc.h>
 #include <asm/setup.h>
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web