diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2005-01-12 21:19:31 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2005-01-12 21:19:31 +0000 |
| commit | 8aaf5f19fd6ada03688a6c465c75eb80f285ebad (patch) | |
| tree | 017b85d910b1905ab9f58e07285a340867e5ddf5 /include | |
| parent | 916edfbe36aa60e3e495af59e4c54aad7f77c27b (diff) | |
| parent | bfc52a39f05cf3c661d9b0ca5a98aef6e6a97f50 (diff) | |
Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-smp
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/smp.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/tlb.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h index 8375e904d562..f21fd8f6bcdd 100644 --- a/include/asm-arm/smp.h +++ b/include/asm-arm/smp.h @@ -53,6 +53,6 @@ extern void smp_cross_call(cpumask_t callmap); * Boot a secondary CPU, and assign it the specified idle task. * This also gives us the initial stack to use for this CPU. */ -extern int __init boot_secondary(unsigned int cpu, struct task_struct *); +extern int boot_secondary(unsigned int cpu, struct task_struct *); #endif /* ifndef __ASM_ARM_SMP_H */ diff --git a/include/asm-arm/tlb.h b/include/asm-arm/tlb.h index ab3cad4fb53d..0843a876b3ce 100644 --- a/include/asm-arm/tlb.h +++ b/include/asm-arm/tlb.h @@ -91,4 +91,6 @@ tlb_is_full_mm(struct mmu_gather *tlb) #define pte_free_tlb(tlb,ptep) pte_free(ptep) #define pmd_free_tlb(tlb,pmdp) pmd_free(pmdp) +#define tlb_migrate_finish(mm) do { } while (0) + #endif |