diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-07-01 07:12:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-07-01 07:12:53 -0700 |
| commit | bf5c4064091ffbdc2a958f7c3cbff0b400382e63 (patch) | |
| tree | d68f8042e426154b21db76be09fa98938cf39149 /include | |
| parent | 90d90ae3132f22bf526745d913c41448250165e3 (diff) | |
| parent | fbd7fa39d68c3828f324e556e3f61e462282021c (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap/pm.h | 3 | ||||
| -rw-r--r-- | include/asm-i386/pgtable.h | 22 | ||||
| -rw-r--r-- | include/linux/init_task.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
4 files changed, 24 insertions, 6 deletions
diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h index 2976b46c3a3d..83911b919b2a 100644 --- a/include/asm-arm/arch-omap/pm.h +++ b/include/asm-arm/arch-omap/pm.h @@ -85,9 +85,6 @@ extern void omap_pm_idle(void); extern void omap_pm_suspend(void); extern int omap_cpu_suspend(unsigned short, unsigned short); extern int omap_idle_loop_suspend(void); -extern struct async_struct *omap_pm_sercons; -extern unsigned int serial_in(struct async_struct *, int); -extern unsigned int serial_out(struct async_struct *, int, int); #ifdef CONFIG_ARCH_OMAP1510 #define OMAP_SRAM_IDLE_SUSPEND 0xd002F000 diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index b95fedb5b32d..a22128c2604e 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h @@ -285,7 +285,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) * Chop off the NX bit (if present), and add the NX portion of * the newprot (if present): */ - pte.pte_high &= -1 ^ (1 << (_PAGE_BIT_NX - 32)); + pte.pte_high &= ~(1 << (_PAGE_BIT_NX - 32)); pte.pte_high |= (pgprot_val(newprot) >> 32) & \ (__supported_pte_mask >> 32); #endif @@ -344,6 +344,26 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) #define pte_offset_kernel(dir, address) \ ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(address)) +/* + * Helper function that returns the kernel pagetable entry controlling + * the virtual address 'address'. NULL means no pagetable entry present. + * NOTE: the return type is pte_t but if the pmd is PSE then we return it + * as a pte too. + */ +extern pte_t *lookup_address(unsigned long address); + +/* + * Make a given kernel text page executable/non-executable. + * Returns the previous executability setting of that page (which + * is used to restore the previous state). Used by the SMP bootup code. + * NOTE: this is an __init function for security reasons. + */ +#ifdef CONFIG_X86_PAE + extern int set_kernel_exec(unsigned long vaddr, int enable); +#else + static inline int set_kernel_exec(unsigned long vaddr, int enable) { return 0;} +#endif + #if defined(CONFIG_HIGHPTE) #define pte_offset_map(dir, address) \ ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 29189706ea57..9937c8df8d7c 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -54,7 +54,7 @@ #define INIT_SIGHAND(sighand) { \ .count = ATOMIC_INIT(1), \ - .action = { {{0,}}, }, \ + .action = { {{NULL,}}, }, \ .siglock = SPIN_LOCK_UNLOCKED, \ } diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2299b75b0518..0a73d0d2c271 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1176,7 +1176,8 @@ #define PCI_DEVICE_ID_VIA_8763_0 0x0198 #define PCI_DEVICE_ID_VIA_8380_0 0x0204 #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 -#define PCI_DEVICE_ID_VIA_8363_0 0x0305 +#define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 +#define PCI_DEVICE_ID_VIA_8363_0 0x0305 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 #define PCI_DEVICE_ID_VIA_8501_0 0x0501 #define PCI_DEVICE_ID_VIA_82C505 0x0505 |