Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88624
b: refs/heads/master
c: c99aa38
h: refs/heads/master
v: v3
  • Loading branch information
Paolo Ciarrocchi authored and Ingo Molnar committed Apr 17, 2008
1 parent 1f095bb commit a01eae5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8108576a78a68851de194d6ed2aa0a951de7bb7f
refs/heads/master: c99aa3804eecbeadabcf658a535e8a00d0f2b6e6
15 changes: 7 additions & 8 deletions trunk/arch/x86/kernel/cpu/nexgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
* Detect a NexGen CPU running without BIOS hypercode new enough
* to have CPUID. (Thanks to Herbert Oppmann)
*/

static int __cpuinit deep_magic_nexgen_probe(void)
{
int ret;

__asm__ __volatile__ (
" movw $0x5555, %%ax\n"
" xorw %%dx,%%dx\n"
Expand All @@ -22,22 +22,21 @@ static int __cpuinit deep_magic_nexgen_probe(void)
" movl $0, %%eax\n"
" jnz 1f\n"
" movl $1, %%eax\n"
"1:\n"
: "=a" (ret) : : "cx", "dx" );
"1:\n"
: "=a" (ret) : : "cx", "dx");
return ret;
}

static void __cpuinit init_nexgen(struct cpuinfo_x86 * c)
static void __cpuinit init_nexgen(struct cpuinfo_x86 *c)
{
c->x86_cache_size = 256; /* A few had 1 MB... */
}

static void __cpuinit nexgen_identify(struct cpuinfo_x86 * c)
static void __cpuinit nexgen_identify(struct cpuinfo_x86 *c)
{
/* Detect NexGen with old hypercode */
if ( deep_magic_nexgen_probe() ) {
if (deep_magic_nexgen_probe())
strcpy(c->x86_vendor_id, "NexGenDriven");
}
}

static struct cpu_dev nexgen_cpu_dev __cpuinitdata = {
Expand Down

0 comments on commit a01eae5

Please sign in to comment.