diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:12:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:12:58 -0700 |
commit | e766f1cc596078b1603ac2c96617660c4c7e2d81 (patch) | |
tree | 86f24a621dbe39fd25dcec539c2f969f50bfbcab /include/asm-sparc64/cpudata.h | |
parent | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (diff) | |
parent | ebede60741e2cec6d210f137fd22a30e37abc0be (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc64/cpudata.h')
-rw-r--r-- | include/asm-sparc64/cpudata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h index cc7198aaac5..9a3a81f1cc5 100644 --- a/include/asm-sparc64/cpudata.h +++ b/include/asm-sparc64/cpudata.h @@ -1,6 +1,6 @@ /* cpudata.h: Per-cpu parameters. * - * Copyright (C) 2003 David S. Miller (davem@redhat.com) + * Copyright (C) 2003, 2005 David S. Miller (davem@redhat.com) */ #ifndef _SPARC64_CPUDATA_H @@ -10,7 +10,7 @@ typedef struct { /* Dcache line 1 */ - unsigned int __pad0; /* bh_count moved to irq_stat for consistency. KAO */ + unsigned int __softirq_pending; /* must be 1st, see rtrap.S */ unsigned int multiplier; unsigned int counter; unsigned int idle_volume; |