diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-01 12:00:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-01 12:00:22 -0800 |
| commit | dd472546edefe0d48613c466b110533514e20455 (patch) | |
| tree | 7d54767ff5f82cdf12ae864b317d349b7f5976f8 /include/asm-mips/asm.h | |
| parent | f9dadfa71bc594df09044da61d1c72701121d802 (diff) | |
| parent | 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 (diff) | |
| download | lwn-dd472546edefe0d48613c466b110533514e20455.tar.gz lwn-dd472546edefe0d48613c466b110533514e20455.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix warning in mips-boards generic PCI
[MIPS] SMTC: Synchronize cp0 counters on bootup.
[MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup.
[MIPS] 16K & 64K page size fixes
Diffstat (limited to 'include/asm-mips/asm.h')
| -rw-r--r-- | include/asm-mips/asm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/asm.h b/include/asm-mips/asm.h index e3038a4599ee..838eb3144d81 100644 --- a/include/asm-mips/asm.h +++ b/include/asm-mips/asm.h @@ -344,6 +344,7 @@ symbol = value #define PTR_L lw #define PTR_S sw #define PTR_LA la +#define PTR_LI li #define PTR_SLL sll #define PTR_SLLV sllv #define PTR_SRL srl @@ -368,6 +369,7 @@ symbol = value #define PTR_L ld #define PTR_S sd #define PTR_LA dla +#define PTR_LI dli #define PTR_SLL dsll #define PTR_SLLV dsllv #define PTR_SRL dsrl |