diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2009-07-18 11:12:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-08 11:44:11 -0400 |
| commit | 1e5de18278e6862f4198412b5059a03770fa816a (patch) | |
| tree | 23ca6dfed95bd5f53d69d4b94ada59358765ad79 /drivers/pnp | |
| parent | 57594742a2b545f8f114cda34f15650be8ae976d (diff) | |
x86: Introduce GDT_ENTRY_INIT()
GDT_ENTRY_INIT is static initializer of desc_struct.
We already have similar macro GDT_ENTRY() but it's static
initializer for u64 and it cannot be used for desc_struct.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
LKML-Reference: <20090718151219.GD11294@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpbios/bioscalls.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c index 45ad3e9cc362..bd035e3d3550 100644 --- a/drivers/pnp/pnpbios/bioscalls.c +++ b/drivers/pnp/pnpbios/bioscalls.c | |||
| @@ -60,7 +60,7 @@ do { \ | |||
| 60 | set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ | 60 | set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ |
| 61 | } while(0) | 61 | } while(0) |
| 62 | 62 | ||
| 63 | static struct desc_struct bad_bios_desc; | 63 | static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092, 0, 0); |
| 64 | 64 | ||
| 65 | /* | 65 | /* |
| 66 | * At some point we want to use this stack frame pointer to unwind | 66 | * At some point we want to use this stack frame pointer to unwind |
| @@ -476,9 +476,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header) | |||
| 476 | pnp_bios_callpoint.offset = header->fields.pm16offset; | 476 | pnp_bios_callpoint.offset = header->fields.pm16offset; |
| 477 | pnp_bios_callpoint.segment = PNP_CS16; | 477 | pnp_bios_callpoint.segment = PNP_CS16; |
| 478 | 478 | ||
| 479 | bad_bios_desc.a = 0; | ||
| 480 | bad_bios_desc.b = 0x00409200; | ||
| 481 | |||
| 482 | set_desc_base(&bad_bios_desc, (unsigned long)__va(0x40UL << 4)); | 479 | set_desc_base(&bad_bios_desc, (unsigned long)__va(0x40UL << 4)); |
| 483 | set_desc_limit(&bad_bios_desc, 4095 - (0x40 << 4)); | 480 | set_desc_limit(&bad_bios_desc, 4095 - (0x40 << 4)); |
| 484 | for_each_possible_cpu(i) { | 481 | for_each_possible_cpu(i) { |
