From: Andrew Morton <akpm@osdl.org>
To: Edgar Hucek <hostmaster@ed-soft.at>
Cc: linux-kernel@vger.kernel.org, "Zach, Yoav" <yoav.zach@intel.com>,
Matt Domsch <Matt_Domsch@dell.com>
Subject: Re: [PATCH 1/1] EFI: Fix gdt load
Date: Sat, 4 Mar 2006 18:43:19 -0800 [thread overview]
Message-ID: <20060304184319.7b9ec461.akpm@osdl.org> (raw)
In-Reply-To: <4406F0C2.7090002@ed-soft.at>
Edgar Hucek <hostmaster@ed-soft.at> wrote:
>
> This patch makes the kernel bootable again on ia32 EFI systems.
>
Argh, thanks. I'll move the per_cpu() call inside the lock, just in case
we happen to be running preemptibly there.
Zach, Matt: please review, test and ack asap?
diff -puN arch/i386/kernel/efi.c~efi-fix-gdt-load arch/i386/kernel/efi.c
--- devel/arch/i386/kernel/efi.c~efi-fix-gdt-load 2006-03-04 18:40:20.000000000 -0800
+++ devel-akpm/arch/i386/kernel/efi.c 2006-03-04 18:41:50.000000000 -0800
@@ -70,10 +70,13 @@ static void efi_call_phys_prelog(void)
{
unsigned long cr4;
unsigned long temp;
+ struct Xgt_desc_struct *cpu_gdt_descr;
spin_lock(&efi_rt_lock);
local_irq_save(efi_rt_eflags);
+ cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0);
+
/*
* If I don't have PSE, I should just duplicate two entries in page
* directory. If I have PSE, I just need to duplicate one entry in
@@ -103,18 +106,17 @@ static void efi_call_phys_prelog(void)
*/
local_flush_tlb();
- per_cpu(cpu_gdt_descr, 0).address =
- __pa(per_cpu(cpu_gdt_descr, 0).address);
- load_gdt((struct Xgt_desc_struct *)__pa(&per_cpu(cpu_gdt_descr, 0)));
+ cpu_gdt_descr->address = __pa(cpu_gdt_descr->address);
+ load_gdt(cpu_gdt_descr);
}
static void efi_call_phys_epilog(void)
{
unsigned long cr4;
+ struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0);
- per_cpu(cpu_gdt_descr, 0).address =
- (unsigned long)__va(per_cpu(cpu_gdt_descr, 0).address);
- load_gdt((struct Xgt_desc_struct *)__va(&per_cpu(cpu_gdt_descr, 0)));
+ cpu_gdt_descr->address = __va(cpu_gdt_descr->address);
+ load_gdt(cpu_gdt_descr);
cr4 = read_cr4();
_
prev parent reply other threads:[~2006-03-05 2:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-02 13:18 Edgar Hucek
2006-03-02 16:12 ` Zwane Mwaikambo
2006-03-05 2:45 ` Andrew Morton
2006-03-03 10:32 ` Edgar Hucek
2006-03-05 2:43 ` Andrew Morton [this message]
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=20060304184319.7b9ec461.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=Matt_Domsch@dell.com \
--cc=hostmaster@ed-soft.at \
--cc=linux-kernel@vger.kernel.org \
--cc=yoav.zach@intel.com \
/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
Powered by JetHome