All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c
@ 2015-04-12 13:14 Brian Gerst
  2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Brian Gerst @ 2015-04-12 13:14 UTC (permalink / raw)
  To: x86; +Cc: linux-kernel, Ingo Molnar, Denys Vlasenko, Andy Lutomirski

Merge common values for 32-bit native and compat.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
 arch/x86/kernel/asm-offsets.c    | 19 +++++++++++++++++++
 arch/x86/kernel/asm-offsets_32.c | 15 ---------------
 arch/x86/kernel/asm-offsets_64.c | 21 ---------------------
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 9f6b934..b27f6ec 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -41,6 +41,25 @@ void common(void) {
 	OFFSET(pbe_orig_address, pbe, orig_address);
 	OFFSET(pbe_next, pbe, next);
 
+#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
+	BLANK();
+	OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax);
+	OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx);
+	OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx);
+	OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx);
+	OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si);
+	OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di);
+	OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp);
+	OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp);
+	OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip);
+
+	BLANK();
+	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
+
+	BLANK();
+	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
+#endif
+
 #ifdef CONFIG_PARAVIRT
 	BLANK();
 	OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 47703ae..628bfd4c 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -17,17 +17,6 @@ void foo(void);
 
 void foo(void)
 {
-	OFFSET(IA32_SIGCONTEXT_ax, sigcontext, ax);
-	OFFSET(IA32_SIGCONTEXT_bx, sigcontext, bx);
-	OFFSET(IA32_SIGCONTEXT_cx, sigcontext, cx);
-	OFFSET(IA32_SIGCONTEXT_dx, sigcontext, dx);
-	OFFSET(IA32_SIGCONTEXT_si, sigcontext, si);
-	OFFSET(IA32_SIGCONTEXT_di, sigcontext, di);
-	OFFSET(IA32_SIGCONTEXT_bp, sigcontext, bp);
-	OFFSET(IA32_SIGCONTEXT_sp, sigcontext, sp);
-	OFFSET(IA32_SIGCONTEXT_ip, sigcontext, ip);
-	BLANK();
-
 	OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
 	OFFSET(CPUINFO_x86_vendor, cpuinfo_x86, x86_vendor);
 	OFFSET(CPUINFO_x86_model, cpuinfo_x86, x86_model);
@@ -37,7 +26,6 @@ void foo(void)
 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
 	BLANK();
 
-	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
 	OFFSET(TI_cpu, thread_info, cpu);
 	BLANK();
 
@@ -60,9 +48,6 @@ void foo(void)
 	OFFSET(PT_OLDSS,  pt_regs, ss);
 	BLANK();
 
-	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
-	BLANK();
-
 	OFFSET(saved_context_gdt_desc, saved_context, gdt_desc);
 	BLANK();
 
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 5ce6f2d..dcaab87 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -29,27 +29,6 @@ int main(void)
 	BLANK();
 #endif
 
-#ifdef CONFIG_IA32_EMULATION
-	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
-	BLANK();
-
-#define ENTRY(entry) OFFSET(IA32_SIGCONTEXT_ ## entry, sigcontext_ia32, entry)
-	ENTRY(ax);
-	ENTRY(bx);
-	ENTRY(cx);
-	ENTRY(dx);
-	ENTRY(si);
-	ENTRY(di);
-	ENTRY(bp);
-	ENTRY(sp);
-	ENTRY(ip);
-	BLANK();
-#undef ENTRY
-
-	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
-	BLANK();
-#endif
-
 #define ENTRY(entry) OFFSET(pt_regs_ ## entry, pt_regs, entry)
 	ENTRY(bx);
 	ENTRY(cx);
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] x86: Remove unused TI_cpu
  2015-04-12 13:14 [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Brian Gerst
@ 2015-04-12 13:14 ` Brian Gerst
  2015-04-12 18:43   ` Andy Lutomirski
                     ` (2 more replies)
  2015-04-12 18:43 ` [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Andy Lutomirski
                   ` (2 subsequent siblings)
  3 siblings, 3 replies; 8+ messages in thread
From: Brian Gerst @ 2015-04-12 13:14 UTC (permalink / raw)
  To: x86; +Cc: linux-kernel, Ingo Molnar, Denys Vlasenko, Andy Lutomirski

Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
 arch/x86/kernel/asm-offsets_32.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 628bfd4c..6ce3902 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -26,9 +26,6 @@ void foo(void)
 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
 	BLANK();
 
-	OFFSET(TI_cpu, thread_info, cpu);
-	BLANK();
-
 	OFFSET(PT_EBX, pt_regs, bx);
 	OFFSET(PT_ECX, pt_regs, cx);
 	OFFSET(PT_EDX, pt_regs, dx);
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c
  2015-04-12 13:14 [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Brian Gerst
  2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
@ 2015-04-12 18:43 ` Andy Lutomirski
  2015-04-15 15:45 ` [tip:x86/asm] x86/asm: " tip-bot for Brian Gerst
  2015-05-05 19:21 ` [tip:x86/cleanups] x86: " tip-bot for Brian Gerst
  3 siblings, 0 replies; 8+ messages in thread
From: Andy Lutomirski @ 2015-04-12 18:43 UTC (permalink / raw)
  To: Brian Gerst; +Cc: X86 ML, linux-kernel, Ingo Molnar, Denys Vlasenko

On Sun, Apr 12, 2015 at 6:14 AM, Brian Gerst <brgerst@gmail.com> wrote:
> Merge common values for 32-bit native and compat.
>
> Signed-off-by: Brian Gerst <brgerst@gmail.com>

Acked-by: Andy Lutomirski <luto@kernel.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] x86: Remove unused TI_cpu
  2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
@ 2015-04-12 18:43   ` Andy Lutomirski
  2015-04-15 15:45   ` [tip:x86/asm] x86/asm: " tip-bot for Brian Gerst
  2015-05-05 19:21   ` [tip:x86/cleanups] x86: " tip-bot for Brian Gerst
  2 siblings, 0 replies; 8+ messages in thread
From: Andy Lutomirski @ 2015-04-12 18:43 UTC (permalink / raw)
  To: Brian Gerst; +Cc: X86 ML, linux-kernel, Ingo Molnar, Denys Vlasenko

On Sun, Apr 12, 2015 at 6:14 AM, Brian Gerst <brgerst@gmail.com> wrote:
> Signed-off-by: Brian Gerst <brgerst@gmail.com>

Acked-by: Andy Lutomirski <luto@kernel.org>

> ---
>  arch/x86/kernel/asm-offsets_32.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
> index 628bfd4c..6ce3902 100644
> --- a/arch/x86/kernel/asm-offsets_32.c
> +++ b/arch/x86/kernel/asm-offsets_32.c
> @@ -26,9 +26,6 @@ void foo(void)
>         OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
>         BLANK();
>
> -       OFFSET(TI_cpu, thread_info, cpu);
> -       BLANK();
> -
>         OFFSET(PT_EBX, pt_regs, bx);
>         OFFSET(PT_ECX, pt_regs, cx);
>         OFFSET(PT_EDX, pt_regs, dx);
> --
> 2.1.0
>



-- 
Andy Lutomirski
AMA Capital Management, LLC

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [tip:x86/asm] x86/asm: Merge common 32-bit values in asm-offsets.c
  2015-04-12 13:14 [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Brian Gerst
  2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
  2015-04-12 18:43 ` [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Andy Lutomirski
@ 2015-04-15 15:45 ` tip-bot for Brian Gerst
  2015-05-05 19:21 ` [tip:x86/cleanups] x86: " tip-bot for Brian Gerst
  3 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Brian Gerst @ 2015-04-15 15:45 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: linux-kernel, luto, tglx, brgerst, mingo, hpa, dvlasenk, luto

Commit-ID:  4d178f94ebe123d462a51169b53854cb7f198888
Gitweb:     http://git.kernel.org/tip/4d178f94ebe123d462a51169b53854cb7f198888
Author:     Brian Gerst <brgerst@gmail.com>
AuthorDate: Sun, 12 Apr 2015 09:14:45 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 15 Apr 2015 11:28:49 +0200

x86/asm: Merge common 32-bit values in asm-offsets.c

Merge common values for 32-bit native and compat.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Link: http://lkml.kernel.org/r/1428844486-6638-1-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/asm-offsets.c    | 19 +++++++++++++++++++
 arch/x86/kernel/asm-offsets_32.c | 15 ---------------
 arch/x86/kernel/asm-offsets_64.c | 21 ---------------------
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 9f6b934..b27f6ec 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -41,6 +41,25 @@ void common(void) {
 	OFFSET(pbe_orig_address, pbe, orig_address);
 	OFFSET(pbe_next, pbe, next);
 
+#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
+	BLANK();
+	OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax);
+	OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx);
+	OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx);
+	OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx);
+	OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si);
+	OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di);
+	OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp);
+	OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp);
+	OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip);
+
+	BLANK();
+	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
+
+	BLANK();
+	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
+#endif
+
 #ifdef CONFIG_PARAVIRT
 	BLANK();
 	OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 47703ae..628bfd4c 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -17,17 +17,6 @@ void foo(void);
 
 void foo(void)
 {
-	OFFSET(IA32_SIGCONTEXT_ax, sigcontext, ax);
-	OFFSET(IA32_SIGCONTEXT_bx, sigcontext, bx);
-	OFFSET(IA32_SIGCONTEXT_cx, sigcontext, cx);
-	OFFSET(IA32_SIGCONTEXT_dx, sigcontext, dx);
-	OFFSET(IA32_SIGCONTEXT_si, sigcontext, si);
-	OFFSET(IA32_SIGCONTEXT_di, sigcontext, di);
-	OFFSET(IA32_SIGCONTEXT_bp, sigcontext, bp);
-	OFFSET(IA32_SIGCONTEXT_sp, sigcontext, sp);
-	OFFSET(IA32_SIGCONTEXT_ip, sigcontext, ip);
-	BLANK();
-
 	OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
 	OFFSET(CPUINFO_x86_vendor, cpuinfo_x86, x86_vendor);
 	OFFSET(CPUINFO_x86_model, cpuinfo_x86, x86_model);
@@ -37,7 +26,6 @@ void foo(void)
 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
 	BLANK();
 
-	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
 	OFFSET(TI_cpu, thread_info, cpu);
 	BLANK();
 
@@ -60,9 +48,6 @@ void foo(void)
 	OFFSET(PT_OLDSS,  pt_regs, ss);
 	BLANK();
 
-	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
-	BLANK();
-
 	OFFSET(saved_context_gdt_desc, saved_context, gdt_desc);
 	BLANK();
 
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 5ce6f2d..dcaab87 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -29,27 +29,6 @@ int main(void)
 	BLANK();
 #endif
 
-#ifdef CONFIG_IA32_EMULATION
-	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
-	BLANK();
-
-#define ENTRY(entry) OFFSET(IA32_SIGCONTEXT_ ## entry, sigcontext_ia32, entry)
-	ENTRY(ax);
-	ENTRY(bx);
-	ENTRY(cx);
-	ENTRY(dx);
-	ENTRY(si);
-	ENTRY(di);
-	ENTRY(bp);
-	ENTRY(sp);
-	ENTRY(ip);
-	BLANK();
-#undef ENTRY
-
-	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
-	BLANK();
-#endif
-
 #define ENTRY(entry) OFFSET(pt_regs_ ## entry, pt_regs, entry)
 	ENTRY(bx);
 	ENTRY(cx);

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [tip:x86/asm] x86/asm: Remove unused TI_cpu
  2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
  2015-04-12 18:43   ` Andy Lutomirski
@ 2015-04-15 15:45   ` tip-bot for Brian Gerst
  2015-05-05 19:21   ` [tip:x86/cleanups] x86: " tip-bot for Brian Gerst
  2 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Brian Gerst @ 2015-04-15 15:45 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: brgerst, mingo, hpa, dvlasenk, tglx, linux-kernel, luto, luto

Commit-ID:  14434052ffb3b7fe8f491e9d0a7793376fb79155
Gitweb:     http://git.kernel.org/tip/14434052ffb3b7fe8f491e9d0a7793376fb79155
Author:     Brian Gerst <brgerst@gmail.com>
AuthorDate: Sun, 12 Apr 2015 09:14:46 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 15 Apr 2015 11:28:50 +0200

x86/asm: Remove unused TI_cpu

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Link: http://lkml.kernel.org/r/1428844486-6638-2-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/asm-offsets_32.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 628bfd4c..6ce3902 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -26,9 +26,6 @@ void foo(void)
 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
 	BLANK();
 
-	OFFSET(TI_cpu, thread_info, cpu);
-	BLANK();
-
 	OFFSET(PT_EBX, pt_regs, bx);
 	OFFSET(PT_ECX, pt_regs, cx);
 	OFFSET(PT_EDX, pt_regs, dx);

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [tip:x86/cleanups] x86: Merge common 32-bit values in asm-offsets.c
  2015-04-12 13:14 [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Brian Gerst
                   ` (2 preceding siblings ...)
  2015-04-15 15:45 ` [tip:x86/asm] x86/asm: " tip-bot for Brian Gerst
@ 2015-05-05 19:21 ` tip-bot for Brian Gerst
  3 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Brian Gerst @ 2015-05-05 19:21 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: linux-kernel, mingo, tglx, luto, hpa, dvlasenk, brgerst

Commit-ID:  fd91784beb91239a697f855b6cda5035c1c5d6a7
Gitweb:     http://git.kernel.org/tip/fd91784beb91239a697f855b6cda5035c1c5d6a7
Author:     Brian Gerst <brgerst@gmail.com>
AuthorDate: Sun, 12 Apr 2015 09:14:45 -0400
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 5 May 2015 20:48:02 +0200

x86: Merge common 32-bit values in asm-offsets.c

Merge common values for 32-bit native and compat.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/1428844486-6638-1-git-send-email-brgerst@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/asm-offsets.c    | 19 +++++++++++++++++++
 arch/x86/kernel/asm-offsets_32.c | 15 ---------------
 arch/x86/kernel/asm-offsets_64.c | 21 ---------------------
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 9f6b934..b27f6ec 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -41,6 +41,25 @@ void common(void) {
 	OFFSET(pbe_orig_address, pbe, orig_address);
 	OFFSET(pbe_next, pbe, next);
 
+#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
+	BLANK();
+	OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax);
+	OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx);
+	OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx);
+	OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx);
+	OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si);
+	OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di);
+	OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp);
+	OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp);
+	OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip);
+
+	BLANK();
+	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
+
+	BLANK();
+	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
+#endif
+
 #ifdef CONFIG_PARAVIRT
 	BLANK();
 	OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 47703ae..628bfd4c 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -17,17 +17,6 @@ void foo(void);
 
 void foo(void)
 {
-	OFFSET(IA32_SIGCONTEXT_ax, sigcontext, ax);
-	OFFSET(IA32_SIGCONTEXT_bx, sigcontext, bx);
-	OFFSET(IA32_SIGCONTEXT_cx, sigcontext, cx);
-	OFFSET(IA32_SIGCONTEXT_dx, sigcontext, dx);
-	OFFSET(IA32_SIGCONTEXT_si, sigcontext, si);
-	OFFSET(IA32_SIGCONTEXT_di, sigcontext, di);
-	OFFSET(IA32_SIGCONTEXT_bp, sigcontext, bp);
-	OFFSET(IA32_SIGCONTEXT_sp, sigcontext, sp);
-	OFFSET(IA32_SIGCONTEXT_ip, sigcontext, ip);
-	BLANK();
-
 	OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
 	OFFSET(CPUINFO_x86_vendor, cpuinfo_x86, x86_vendor);
 	OFFSET(CPUINFO_x86_model, cpuinfo_x86, x86_model);
@@ -37,7 +26,6 @@ void foo(void)
 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
 	BLANK();
 
-	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
 	OFFSET(TI_cpu, thread_info, cpu);
 	BLANK();
 
@@ -60,9 +48,6 @@ void foo(void)
 	OFFSET(PT_OLDSS,  pt_regs, ss);
 	BLANK();
 
-	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
-	BLANK();
-
 	OFFSET(saved_context_gdt_desc, saved_context, gdt_desc);
 	BLANK();
 
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 5ce6f2d..dcaab87 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -29,27 +29,6 @@ int main(void)
 	BLANK();
 #endif
 
-#ifdef CONFIG_IA32_EMULATION
-	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
-	BLANK();
-
-#define ENTRY(entry) OFFSET(IA32_SIGCONTEXT_ ## entry, sigcontext_ia32, entry)
-	ENTRY(ax);
-	ENTRY(bx);
-	ENTRY(cx);
-	ENTRY(dx);
-	ENTRY(si);
-	ENTRY(di);
-	ENTRY(bp);
-	ENTRY(sp);
-	ENTRY(ip);
-	BLANK();
-#undef ENTRY
-
-	OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
-	BLANK();
-#endif
-
 #define ENTRY(entry) OFFSET(pt_regs_ ## entry, pt_regs, entry)
 	ENTRY(bx);
 	ENTRY(cx);

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [tip:x86/cleanups] x86: Remove unused TI_cpu
  2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
  2015-04-12 18:43   ` Andy Lutomirski
  2015-04-15 15:45   ` [tip:x86/asm] x86/asm: " tip-bot for Brian Gerst
@ 2015-05-05 19:21   ` tip-bot for Brian Gerst
  2 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Brian Gerst @ 2015-05-05 19:21 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: hpa, mingo, dvlasenk, brgerst, linux-kernel, luto, tglx

Commit-ID:  c07e5a542e41b87583a8bc0e2849d14bbe919be0
Gitweb:     http://git.kernel.org/tip/c07e5a542e41b87583a8bc0e2849d14bbe919be0
Author:     Brian Gerst <brgerst@gmail.com>
AuthorDate: Sun, 12 Apr 2015 09:14:46 -0400
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 5 May 2015 20:48:02 +0200

x86: Remove unused TI_cpu

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/1428844486-6638-2-git-send-email-brgerst@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/asm-offsets_32.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 628bfd4c..6ce3902 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -26,9 +26,6 @@ void foo(void)
 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
 	BLANK();
 
-	OFFSET(TI_cpu, thread_info, cpu);
-	BLANK();
-
 	OFFSET(PT_EBX, pt_regs, bx);
 	OFFSET(PT_ECX, pt_regs, cx);
 	OFFSET(PT_EDX, pt_regs, dx);

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-05-05 19:22 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-12 13:14 [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Brian Gerst
2015-04-12 13:14 ` [PATCH 2/2] x86: Remove unused TI_cpu Brian Gerst
2015-04-12 18:43   ` Andy Lutomirski
2015-04-15 15:45   ` [tip:x86/asm] x86/asm: " tip-bot for Brian Gerst
2015-05-05 19:21   ` [tip:x86/cleanups] x86: " tip-bot for Brian Gerst
2015-04-12 18:43 ` [PATCH 1/2] x86: Merge common 32-bit values in asm-offsets.c Andy Lutomirski
2015-04-15 15:45 ` [tip:x86/asm] x86/asm: " tip-bot for Brian Gerst
2015-05-05 19:21 ` [tip:x86/cleanups] x86: " tip-bot for Brian Gerst

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.