diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-26 08:44:18 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-26 08:44:18 +1100 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /include/asm-sparc64 | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
| download | linux-3.10-54f53f2b94feb72622bec7a8563fc487d9f97720.tar.gz linux-3.10-54f53f2b94feb72622bec7a8563fc487d9f97720.tar.bz2 linux-3.10-54f53f2b94feb72622bec7a8563fc487d9f97720.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/backoff.h | 3 | ||||
| -rw-r--r-- | include/asm-sparc64/hvtramp.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/spitfire.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h index dadd6c385c6..fa1fdf67e35 100644 --- a/include/asm-sparc64/backoff.h +++ b/include/asm-sparc64/backoff.h @@ -12,7 +12,8 @@ mov reg, tmp; \ 88: brnz,pt tmp, 88b; \ sub tmp, 1, tmp; \ - cmp reg, BACKOFF_LIMIT; \ + set BACKOFF_LIMIT, tmp; \ + cmp reg, tmp; \ bg,pn %xcc, label; \ nop; \ ba,pt %xcc, label; \ diff --git a/include/asm-sparc64/hvtramp.h b/include/asm-sparc64/hvtramp.h index c7dd6ad056d..b2b9b947b3a 100644 --- a/include/asm-sparc64/hvtramp.h +++ b/include/asm-sparc64/hvtramp.h @@ -16,7 +16,7 @@ struct hvtramp_descr { __u64 fault_info_va; __u64 fault_info_pa; __u64 thread_reg; - struct hvtramp_mapping maps[2]; + struct hvtramp_mapping maps[1]; }; extern void hv_cpu_startup(unsigned long hvdescr_pa); diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h index 63b7040e813..985ea7e3199 100644 --- a/include/asm-sparc64/spitfire.h +++ b/include/asm-sparc64/spitfire.h @@ -63,6 +63,8 @@ extern void cheetah_enable_pcache(void); SPITFIRE_HIGHEST_LOCKED_TLBENT : \ CHEETAH_HIGHEST_LOCKED_TLBENT) +extern int num_kernel_image_mappings; + /* The data cache is write through, so this just invalidates the * specified line. */ |