diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 13:07:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 13:07:28 -0400 |
| commit | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch) | |
| tree | 3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /include/asm-alpha | |
| parent | 8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
| download | kernel-crypto-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.gz kernel-crypto-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.xz kernel-crypto-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.zip | |
Merge upstream kernel changes into 'C/H/S support' branch of libata.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-alpha/smp.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/asm-alpha/agp.h b/include/asm-alpha/agp.h index c99dbbb5bcb..ef855a3bc0f 100644 --- a/include/asm-alpha/agp.h +++ b/include/asm-alpha/agp.h @@ -10,4 +10,14 @@ #define flush_agp_mappings() #define flush_agp_cache() mb() +/* Convert a physical address to an address suitable for the GART. */ +#define phys_to_gart(x) (x) +#define gart_to_phys(x) (x) + +/* GATT allocation. Returns/accepts GATT kernel virtual address. */ +#define alloc_gatt_pages(order) \ + ((char *)__get_free_pages(GFP_KERNEL, (order))) +#define free_gatt_pages(table, order) \ + free_pages((unsigned long)(table), (order)) + #endif diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index cbc173ae45a..9950706abdf 100644 --- a/include/asm-alpha/smp.h +++ b/include/asm-alpha/smp.h @@ -43,7 +43,7 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS]; #define PROC_CHANGE_PENALTY 20 #define hard_smp_processor_id() __hard_smp_processor_id() -#define smp_processor_id() (current_thread_info()->cpu) +#define raw_smp_processor_id() (current_thread_info()->cpu) extern cpumask_t cpu_present_mask; extern cpumask_t cpu_online_map; |