diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 12:46:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 12:46:06 -0500 |
| commit | 414f827c46973ba39320cfb43feb55a0eeb9b4e8 (patch) | |
| tree | 45e860974ef698e71370a0ebdddcff4f14fbdf9e /include/asm-i386/pda.h | |
| parent | 86a71dbd3e81e8870d0f0e56b87875f57e58222b (diff) | |
| parent | 126b1922367fbe5513daa675a2abd13ed3917f4e (diff) | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (94 commits)
[PATCH] x86-64: Remove mk_pte_phys()
[PATCH] i386: Fix broken CONFIG_COMPAT_VDSO on i386
[PATCH] i386: fix 32-bit ioctls on x64_32
[PATCH] x86: Unify pcspeaker platform device code between i386/x86-64
[PATCH] i386: Remove extern declaration from mm/discontig.c, put in header.
[PATCH] i386: Rename cpu_gdt_descr and remove extern declaration from smpboot.c
[PATCH] i386: Move mce_disabled to asm/mce.h
[PATCH] i386: paravirt unhandled fallthrough
[PATCH] x86_64: Wire up compat epoll_pwait
[PATCH] x86: Don't require the vDSO for handling a.out signals
[PATCH] i386: Fix Cyrix MediaGX detection
[PATCH] i386: Fix warning in cpu initialization
[PATCH] i386: Fix warning in microcode.c
[PATCH] x86: Enable NMI watchdog for AMD Family 0x10 CPUs
[PATCH] x86: Add new CPUID bits for AMD Family 10 CPUs in /proc/cpuinfo
[PATCH] i386: Remove fastcall in paravirt.[ch]
[PATCH] x86-64: Fix wrong gcc check in bitops.h
[PATCH] x86-64: survive having no irq mapping for a vector
[PATCH] i386: geode configuration fixes
[PATCH] i386: add option to show more code in oops reports
...
Diffstat (limited to 'include/asm-i386/pda.h')
| -rw-r--r-- | include/asm-i386/pda.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-i386/pda.h b/include/asm-i386/pda.h index 2ba2736aa109..b12d59a318b7 100644 --- a/include/asm-i386/pda.h +++ b/include/asm-i386/pda.h | |||
| @@ -39,19 +39,19 @@ extern struct i386_pda _proxy_pda; | |||
| 39 | if (0) { T__ tmp__; tmp__ = (val); } \ | 39 | if (0) { T__ tmp__; tmp__ = (val); } \ |
| 40 | switch (sizeof(_proxy_pda.field)) { \ | 40 | switch (sizeof(_proxy_pda.field)) { \ |
| 41 | case 1: \ | 41 | case 1: \ |
| 42 | asm(op "b %1,%%gs:%c2" \ | 42 | asm(op "b %1,%%fs:%c2" \ |
| 43 | : "+m" (_proxy_pda.field) \ | 43 | : "+m" (_proxy_pda.field) \ |
| 44 | :"ri" ((T__)val), \ | 44 | :"ri" ((T__)val), \ |
| 45 | "i"(pda_offset(field))); \ | 45 | "i"(pda_offset(field))); \ |
| 46 | break; \ | 46 | break; \ |
| 47 | case 2: \ | 47 | case 2: \ |
| 48 | asm(op "w %1,%%gs:%c2" \ | 48 | asm(op "w %1,%%fs:%c2" \ |
| 49 | : "+m" (_proxy_pda.field) \ | 49 | : "+m" (_proxy_pda.field) \ |
| 50 | :"ri" ((T__)val), \ | 50 | :"ri" ((T__)val), \ |
| 51 | "i"(pda_offset(field))); \ | 51 | "i"(pda_offset(field))); \ |
| 52 | break; \ | 52 | break; \ |
| 53 | case 4: \ | 53 | case 4: \ |
| 54 | asm(op "l %1,%%gs:%c2" \ | 54 | asm(op "l %1,%%fs:%c2" \ |
| 55 | : "+m" (_proxy_pda.field) \ | 55 | : "+m" (_proxy_pda.field) \ |
| 56 | :"ri" ((T__)val), \ | 56 | :"ri" ((T__)val), \ |
| 57 | "i"(pda_offset(field))); \ | 57 | "i"(pda_offset(field))); \ |
| @@ -65,19 +65,19 @@ extern struct i386_pda _proxy_pda; | |||
| 65 | typeof(_proxy_pda.field) ret__; \ | 65 | typeof(_proxy_pda.field) ret__; \ |
| 66 | switch (sizeof(_proxy_pda.field)) { \ | 66 | switch (sizeof(_proxy_pda.field)) { \ |
| 67 | case 1: \ | 67 | case 1: \ |
| 68 | asm(op "b %%gs:%c1,%0" \ | 68 | asm(op "b %%fs:%c1,%0" \ |
| 69 | : "=r" (ret__) \ | 69 | : "=r" (ret__) \ |
| 70 | : "i" (pda_offset(field)), \ | 70 | : "i" (pda_offset(field)), \ |
| 71 | "m" (_proxy_pda.field)); \ | 71 | "m" (_proxy_pda.field)); \ |
| 72 | break; \ | 72 | break; \ |
| 73 | case 2: \ | 73 | case 2: \ |
| 74 | asm(op "w %%gs:%c1,%0" \ | 74 | asm(op "w %%fs:%c1,%0" \ |
| 75 | : "=r" (ret__) \ | 75 | : "=r" (ret__) \ |
| 76 | : "i" (pda_offset(field)), \ | 76 | : "i" (pda_offset(field)), \ |
| 77 | "m" (_proxy_pda.field)); \ | 77 | "m" (_proxy_pda.field)); \ |
| 78 | break; \ | 78 | break; \ |
| 79 | case 4: \ | 79 | case 4: \ |
| 80 | asm(op "l %%gs:%c1,%0" \ | 80 | asm(op "l %%fs:%c1,%0" \ |
| 81 | : "=r" (ret__) \ | 81 | : "=r" (ret__) \ |
| 82 | : "i" (pda_offset(field)), \ | 82 | : "i" (pda_offset(field)), \ |
| 83 | "m" (_proxy_pda.field)); \ | 83 | "m" (_proxy_pda.field)); \ |