3 files changed, 11 insertions, 8 deletions

diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index 37b599fa4d18..58d2746670b7 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -504,12 +504,12 @@ ENTRY(cpu_gdt_table)
         .quad 0x0000000000000000        /* 0x80 TSS descriptor */
         .quad 0x0000000000000000        /* 0x88 LDT descriptor */
 
-        /* Segments used for calling PnP BIOS */
-        .quad 0x00c09a0000000000        /* 0x90 32-bit code */
-        .quad 0x00809a0000000000        /* 0x98 16-bit code */
-        .quad 0x0080920000000000        /* 0xa0 16-bit data */
-        .quad 0x0080920000000000        /* 0xa8 16-bit data */
-        .quad 0x0080920000000000        /* 0xb0 16-bit data */
+        /* Segments used for calling PnP BIOS have byte granularity */
+        .quad 0x00409a0000000000        /* 0x90 32-bit code */
+        .quad 0x00009a0000000000        /* 0x98 16-bit code */
+        .quad 0x0000920000000000        /* 0xa0 16-bit data */
+        .quad 0x0000920000000000        /* 0xa8 16-bit data */
+        .quad 0x0000920000000000        /* 0xb0 16-bit data */
 
         /*
          * The APM segments have byte granularity and their bases
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
index 37bacfcdbc5d..a72126180e97 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
@@ -283,12 +283,15 @@ int pnp_bios_dev_node_info(struct pnp_dev_node_info *data)
 static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node *data)
 {
         u16 status;
+        u16 tmp_nodenum;
         if (!pnp_bios_present())
                 return PNP_FUNCTION_NOT_SUPPORTED;
         if ( !boot && pnpbios_dont_use_current_config )
                 return PNP_FUNCTION_NOT_SUPPORTED;
+        tmp_nodenum = *nodenum;
         status = call_pnp_bios(PNP_GET_SYS_DEV_NODE, 0, PNP_TS1, 0, PNP_TS2, boot ? 2 : 1, PNP_DS, 0,
-                               nodenum, sizeof(char), data, 65536);
+                               &tmp_nodenum, sizeof(tmp_nodenum), data, 65536);
+        *nodenum = tmp_nodenum;
         return status;
 }
 
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 24cc0c8fe341..9c0593b7a94e 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -54,7 +54,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
         ); } while(0)
 
 #define set_base(ldt,base) _set_base( ((char *)&(ldt)) , (base) )
-#define set_limit(ldt,limit) _set_limit( ((char *)&(ldt)) , ((limit)-1)>>12 )
+#define set_limit(ldt,limit) _set_limit( ((char *)&(ldt)) , ((limit)-1) )
 
 /*
  * Load a segment. Fall back on loading the zero