From: James S. <jsi...@us...> - 2001-10-19 21:19:43
|
Update of /cvsroot/linux-mips/linux/include/asm-mips In directory usw-pr-cvs1:/tmp/cvs-serv13849/include/asm-mips Modified Files: keyboard.h pgalloc.h processor.h softirq.h spinlock.h Removed Files: pgtable.h semaphore.h Log Message: Synced to 2.4.10. Index: keyboard.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/keyboard.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- keyboard.h 2001/10/18 18:06:42 1.6 +++ keyboard.h 2001/10/19 21:19:40 1.7 @@ -26,7 +26,6 @@ char raw_mode); extern char pckbd_unexpected_up(unsigned char keycode); extern void pckbd_leds(unsigned char leds); -extern int pckbd_rate(struct kbd_repeat *rep); extern void pckbd_init_hw(void); extern void pckbd_pm_resume(void); extern unsigned char pckbd_sysrq_xlate[128]; @@ -37,7 +36,6 @@ #define kbd_translate pckbd_translate #define kbd_unexpected_up pckbd_unexpected_up #define kbd_leds pckbd_leds -#define kbd_rate pckbd_rate #define kbd_init_hw pckbd_init_hw #define kbd_sysrq_xlate pckbd_sysrq_xlate @@ -84,7 +82,6 @@ char raw_mode); extern char kbd_unexpected_up(unsigned char keycode); extern void kbd_leds(unsigned char leds); -extern int kbd_rate(struct kbd_repeat *rep); extern void kbd_init_hw(void); extern unsigned char *kbd_sysrq_xlate; Index: pgalloc.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pgalloc.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pgalloc.h 2001/10/11 23:14:57 1.3 +++ pgalloc.h 2001/10/19 21:19:40 1.4 @@ -180,7 +180,7 @@ free_page((unsigned long)pte); } -#define pte_free(pte) pte_free_slow(pte) +#define pte_free(pte) pte_free_fast(pte) #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() Index: processor.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/processor.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- processor.h 2001/10/09 21:54:21 1.4 +++ processor.h 2001/10/19 21:19:40 1.5 @@ -12,7 +12,7 @@ #define _ASM_PROCESSOR_H #include <linux/config.h> - +#include <linux/cache.h> #include <asm/isadep.h> /* @@ -34,7 +34,7 @@ unsigned long *pte_quick; unsigned long pgtable_cache_sz; unsigned long asid_cache; -}; +} __attribute__((__aligned__(SMP_CACHE_BYTES))); /* * System setup and hardware flags.. @@ -167,9 +167,6 @@ }; #endif /* !defined (_LANGUAGE_ASSEMBLY) */ - -#define INIT_MMAP { &init_mm, KSEG0, KSEG1, NULL, PAGE_SHARED, \ - VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL } #define INIT_THREAD { \ /* \ Index: softirq.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/softirq.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- softirq.h 2001/08/22 18:18:14 1.2 +++ softirq.h 2001/10/19 21:19:40 1.3 @@ -40,6 +40,4 @@ #define in_softirq() (local_bh_count(smp_processor_id()) != 0) -#define __cpu_raise_softirq(cpu, nr) set_bit(nr, &softirq_pending(cpu)) - #endif /* _ASM_SOFTIRQ_H */ Index: spinlock.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/spinlock.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- spinlock.h 2001/10/17 17:17:54 1.3 +++ spinlock.h 2001/10/19 21:19:40 1.4 @@ -78,6 +78,8 @@ #define RW_LOCK_UNLOCKED (rwlock_t) { 0 } +#define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0) + static inline void read_lock(rwlock_t *rw) { unsigned int tmp; --- pgtable.h DELETED --- --- semaphore.h DELETED --- |