diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-10 07:06:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-10 07:06:16 -0700 |
| commit | 2850310b191152cfaaaae45a2bb24ebb0a8bfc94 (patch) | |
| tree | 8193ea1857943166366cd95930801169ac163924 /include | |
| parent | cdd3fde3b96adc78dd50b738a977ce77ab4538c0 (diff) | |
| parent | 7e65788c16b7850d4d27ec19b720b546e164e5e7 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-parisc/byteorder.h | 4 | ||||
| -rw-r--r-- | include/asm-parisc/parisc-device.h | 1 | ||||
| -rw-r--r-- | include/asm-parisc/pgtable.h | 8 | ||||
| -rw-r--r-- | include/asm-parisc/processor.h | 1 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/include/asm-parisc/byteorder.h b/include/asm-parisc/byteorder.h index 7b3a2ab4ca1b..9ddeab1777a5 100644 --- a/include/asm-parisc/byteorder.h +++ b/include/asm-parisc/byteorder.h @@ -30,9 +30,9 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x) */ static __inline__ __const__ __u64 ___arch__swab64(__u64 x) { __u64 temp; - __asm__("permh 3210, %0, %0\n\t" + __asm__("permh,3210 %0, %0\n\t" "hshl %0, 8, %1\n\t" - "hshr u, %0, 8, %0\n\t" + "hshr,u %0, 8, %0\n\t" "or %1, %0, %0" : "=r" (x), "=&r" (temp) : "0" (x)); diff --git a/include/asm-parisc/parisc-device.h b/include/asm-parisc/parisc-device.h index bd12a223bf3f..8af731a4c913 100644 --- a/include/asm-parisc/parisc-device.h +++ b/include/asm-parisc/parisc-device.h @@ -33,6 +33,7 @@ struct parisc_driver { char *name; const struct parisc_device_id *id_table; int (*probe) (struct parisc_device *dev); /* New device discovered */ + int (*remove) (struct parisc_device *dev); struct device_driver drv; }; diff --git a/include/asm-parisc/pgtable.h b/include/asm-parisc/pgtable.h index 0262435e1514..be75436b1e51 100644 --- a/include/asm-parisc/pgtable.h +++ b/include/asm-parisc/pgtable.h @@ -368,11 +368,11 @@ extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t); /* Encode and de-code a swap entry */ #define __swp_type(x) ((x).val & 0x1f) -#define __swp_offset(x) ( (((x).val >> 5) & 0xf) | \ - (((x).val >> 7) & ~0xf) ) +#define __swp_offset(x) ( (((x).val >> 6) & 0x7) | \ + (((x).val >> 8) & ~0x7) ) #define __swp_entry(type, offset) ((swp_entry_t) { (type) | \ - ((offset & 0xf) << 5) | \ - ((offset & ~0xf) << 7) }) + ((offset & 0x7) << 6) | \ + ((offset & ~0x7) << 8) }) #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h index 55c38a184b8c..ded1c4904510 100644 --- a/include/asm-parisc/processor.h +++ b/include/asm-parisc/processor.h @@ -142,6 +142,7 @@ struct thread_struct { */ unsigned long thread_saved_pc(struct task_struct *t); +void show_trace(struct task_struct *task, unsigned long *stack); /* * Start user thread in another space. diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index e037c4de0522..c7bd946843b4 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -130,6 +130,8 @@ enum KERN_PIDMAX=55, /* int: PID # limit */ KERN_CORE_PATTERN=56, /* string: pattern for core-file names */ KERN_PANIC_ON_OOPS=57, /* int: whether we will panic on an oops */ + KERN_HPPA_PWRSW=58, /* int: hppa soft-power enable */ + KERN_HPPA_UNALIGNED=59, /* int: hppa unaligned-trap enable */ }; |