diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-17 00:15:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-17 00:15:36 -0400 |
| commit | 6553daeafb4fa15cd07088f543352fa3779e86e1 (patch) | |
| tree | 1e1952e7ce3227160a9bec60b24dc816f495b6b8 /include | |
| parent | edb1e9671a990e6eb9f593636deed7ac43ba9084 (diff) | |
| parent | 8a177c4f17c691c2c9a08a54709d37c6db481a0b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Warn user if cpu is ignored.
[SPARC64]: Fix lockdep, particularly on SMP.
[SPARC64]: Update defconfig.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/oplib.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sparc64/oplib.h b/include/asm-sparc64/oplib.h index 86dc5c018a19..55c5bb27e4da 100644 --- a/include/asm-sparc64/oplib.h +++ b/include/asm-sparc64/oplib.h | |||
| @@ -297,11 +297,7 @@ extern void prom_sun4v_guest_soft_state(void); | |||
| 297 | extern int prom_ihandle2path(int handle, char *buffer, int bufsize); | 297 | extern int prom_ihandle2path(int handle, char *buffer, int bufsize); |
| 298 | 298 | ||
| 299 | /* Client interface level routines. */ | 299 | /* Client interface level routines. */ |
| 300 | extern void prom_set_trap_table(unsigned long tba); | ||
| 301 | extern void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa); | ||
| 302 | |||
| 303 | extern long p1275_cmd(const char *, long, ...); | 300 | extern long p1275_cmd(const char *, long, ...); |
| 304 | |||
| 305 | 301 | ||
| 306 | #if 0 | 302 | #if 0 |
| 307 | #define P1275_SIZE(x) ((((long)((x) / 32)) << 32) | (x)) | 303 | #define P1275_SIZE(x) ((((long)((x) / 32)) << 32) | (x)) |