public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Akinobu Mita <akinobu.mita@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	akinobu.mita@gmail.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/asm] x86: Remove unused patch_espfix_desc()
Date: Mon, 20 Jul 2009 12:01:29 GMT	[thread overview]
Message-ID: <tip-fde0312d01b60a3fd5dc56e69a9613defbbc7097@git.kernel.org> (raw)
In-Reply-To: <20090718150955.GB11294@localhost.localdomain>

Commit-ID:  fde0312d01b60a3fd5dc56e69a9613defbbc7097
Gitweb:     http://git.kernel.org/tip/fde0312d01b60a3fd5dc56e69a9613defbbc7097
Author:     Akinobu Mita <akinobu.mita@gmail.com>
AuthorDate: Sun, 19 Jul 2009 00:09:56 +0900
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 19 Jul 2009 18:27:52 +0200

x86: Remove unused patch_espfix_desc()

patch_espfix_desc() is not used after commit
dc4c2a0aed3b09f6e255bd5c3faa50fe6e0b2ded

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090718150955.GB11294@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/include/asm/traps.h |    4 +---
 arch/x86/kernel/traps.c      |   21 ---------------------
 2 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index bfd74c0..4da91ad 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -81,9 +81,7 @@ extern int panic_on_unrecovered_nmi;
 
 void math_error(void __user *);
 void math_emulate(struct math_emu_info *);
-#ifdef CONFIG_X86_32
-unsigned long patch_espfix_desc(unsigned long, unsigned long);
-#else
+#ifndef CONFIG_X86_32
 asmlinkage void smp_thermal_interrupt(void);
 asmlinkage void mce_threshold_interrupt(void);
 #endif
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 5204332..2367941 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -786,27 +786,6 @@ do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)
 #endif
 }
 
-#ifdef CONFIG_X86_32
-unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp)
-{
-	struct desc_struct *gdt = get_cpu_gdt_table(smp_processor_id());
-	unsigned long base = (kesp - uesp) & -THREAD_SIZE;
-	unsigned long new_kesp = kesp - base;
-	unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
-	__u64 desc = *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS];
-
-	/* Set up base for espfix segment */
-	desc &= 0x00f0ff0000000000ULL;
-	desc |=	((((__u64)base) << 16) & 0x000000ffffff0000ULL) |
-		((((__u64)base) << 32) & 0xff00000000000000ULL) |
-		((((__u64)lim_pages) << 32) & 0x000f000000000000ULL) |
-		(lim_pages & 0xffff);
-	*(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS] = desc;
-
-	return new_kesp;
-}
-#endif
-
 asmlinkage void __attribute__((weak)) smp_thermal_interrupt(void)
 {
 }

  reply	other threads:[~2009-07-20 12:02 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-18 15:08 [PATCH 1/4] x86: use get_desc_base() Akinobu Mita
2009-07-18 15:09 ` [PATCH 2/4] x86: remove unused patch_espfix_desc() Akinobu Mita
2009-07-20 12:01   ` tip-bot for Akinobu Mita [this message]
2009-07-18 15:11 ` [PATCH 3/4] x86: introduce set_desc_base() and set_desc_limit() Akinobu Mita
2009-07-20 12:01   ` [tip:x86/asm] x86: Introduce " tip-bot for Akinobu Mita
2009-07-18 15:12 ` [PATCH 4/4] x86: introduce GDT_ENTRY_INIT() Akinobu Mita
2009-07-20 12:01   ` [tip:x86/asm] x86: Introduce GDT_ENTRY_INIT() tip-bot for Akinobu Mita
2009-08-03  6:20     ` Ingo Molnar
2009-08-03  6:27       ` H. Peter Anvin
2009-08-03 15:11         ` Akinobu Mita
2009-08-03 15:17           ` H. Peter Anvin
2009-08-04 12:18             ` Ingo Molnar
2009-08-08 15:48   ` tip-bot for Akinobu Mita
2009-07-20 12:01 ` [tip:x86/asm] x86: Use get_desc_base() tip-bot for Akinobu Mita

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-fde0312d01b60a3fd5dc56e69a9613defbbc7097@git.kernel.org \
    --to=akinobu.mita@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox