8 files changed, 17 insertions, 7 deletions
diff --git a/include/asm-i386/agp.h b/include/asm-i386/agp.h
index a917ff50354f..b82f5f3ab887 100644
--- a/include/asm-i386/agp.h
+++ b/include/asm-i386/agp.h
@@ -21,4 +21,14 @@ int unmap_page_from_agp(struct page *page);
   worth it. Would need a page for it. */
 #define flush_agp_cache() asm volatile("wbinvd":::"memory")
+/* 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-i386/linkage.h b/include/asm-i386/linkage.h
index af3d8571c5c7..f4a6ebac0247 100644
--- a/include/asm-i386/linkage.h
+++ b/include/asm-i386/linkage.h
@@ -5,9 +5,7 @@
 #define FASTCALL(x)     x __attribute__((regparm(3)))
 #define fastcall        __attribute__((regparm(3)))
-#ifdef CONFIG_REGPARM
+#define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret))
-# define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret))
-#endif
 #ifdef CONFIG_X86_ALIGNMENT_16
 #define __ALIGN .align 16,0x90
diff --git a/include/asm-i386/mach-numaq/mach_ipi.h b/include/asm-i386/mach-numaq/mach_ipi.h
index 1b46fd3f2ae3..c6044488e9e6 100644
--- a/include/asm-i386/mach-numaq/mach_ipi.h
+++ b/include/asm-i386/mach-numaq/mach_ipi.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_MACH_IPI_H
 #define __ASM_MACH_IPI_H
-inline void send_IPI_mask_sequence(cpumask_t, int vector);
+void send_IPI_mask_sequence(cpumask_t, int vector);
 static inline void send_IPI_mask(cpumask_t mask, int vector)
 {
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index ed13969fa2d6..41400d342d44 100644
--- a/include/asm-i386/page.h
+++ b/include/asm-i386/page.h
@@ -68,6 +68,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define HPAGE_MASK      (~(HPAGE_SIZE - 1))
 #define HUGETLB_PAGE_ORDER      (HPAGE_SHIFT - PAGE_SHIFT)
 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
+#define ARCH_HAS_HUGETLB_CLEAN_STALE_PGTABLE
 #endif
 #define pgd_val(x)      ((x).pgd)
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index 8d60c2b4b003..e9efe148fdf7 100644
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -236,6 +236,7 @@ static inline pte_t pte_mkexec(pte_t pte)	{ (pte).pte_low |= _PAGE_USER; return
 static inline pte_t pte_mkdirty(pte_t pte)      { (pte).pte_low |= _PAGE_DIRTY; return pte; }
 static inline pte_t pte_mkyoung(pte_t pte)      { (pte).pte_low |= _PAGE_ACCESSED; return pte; }
 static inline pte_t pte_mkwrite(pte_t pte)      { (pte).pte_low |= _PAGE_RW; return pte; }
+static inline pte_t pte_mkhuge(pte_t pte)       { (pte).pte_low |= _PAGE_PRESENT | _PAGE_PSE; return pte; }
 #ifdef CONFIG_X86_PAE
 # include <asm/pgtable-3level.h>
@@ -275,7 +276,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
 */
 #define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
-#define mk_pte_huge(entry) ((entry).pte_low |= _PAGE_PRESENT | _PAGE_PSE)
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 {
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index e03a206dfa36..55ef31f66bbe 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -51,7 +51,7 @@ extern u8 x86_cpu_to_apicid[];
 * from the initial startup. We map APIC_BASE very early in page_setup(),
 * so this is correct in the x86 case.
 */
-#define __smp_processor_id() (current_thread_info()->cpu)
+#define raw_smp_processor_id() (current_thread_info()->cpu)
 extern cpumask_t cpu_callout_map;
 extern cpumask_t cpu_callin_map;
diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h
index 40c54f69780e..c34709849839 100644
--- a/include/asm-i386/timer.h
+++ b/include/asm-i386/timer.h
@@ -53,6 +53,7 @@ extern struct init_timer_opts timer_cyclone_init;
 extern unsigned long calibrate_tsc(void);
 extern void init_cpu_khz(void);
+extern int recalibrate_cpu_khz(void);
 #ifdef CONFIG_HPET_TIMER
 extern struct init_timer_opts timer_hpet_init;
 extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 61bcc1b1e3f4..176413fb9ae3 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -256,7 +256,7 @@
 #define __NR_io_submit          248
 #define __NR_io_cancel          249
 #define __NR_fadvise64          250
+#define __NR_set_zone_reclaim   251
 #define __NR_exit_group         252
 #define __NR_lookup_dcookie     253
 #define __NR_epoll_create       254

diff --git a/include/asm-i386/agp.h b/include/asm-i386/agp.h index a917ff50354f..b82f5f3ab887 100644 --- a/include/asm-i386/agp.h +++ b/include/asm-i386/agp.h
@@ -21,4 +21,14 @@ int unmap_page_from_agp(struct page *page);
21	worth it. Would need a page for it. */	21	worth it. Would need a page for it. */
22	#define flush_agp_cache() asm volatile("wbinvd":::"memory")	22	#define flush_agp_cache() asm volatile("wbinvd":::"memory")
23		23
		24	/* Convert a physical address to an address suitable for the GART. */
		25	#define phys_to_gart(x) (x)
		26	#define gart_to_phys(x) (x)
		27
		28	/* GATT allocation. Returns/accepts GATT kernel virtual address. */
		29	#define alloc_gatt_pages(order) \
		30	((char *)__get_free_pages(GFP_KERNEL, (order)))
		31	#define free_gatt_pages(table, order) \
		32	free_pages((unsigned long)(table), (order))
		33
24	#endif	34	#endif


diff --git a/include/asm-i386/linkage.h b/include/asm-i386/linkage.h index af3d8571c5c7..f4a6ebac0247 100644 --- a/include/asm-i386/linkage.h +++ b/include/asm-i386/linkage.h
@@ -5,9 +5,7 @@
5	#define FASTCALL(x) x __attribute__((regparm(3)))	5	#define FASTCALL(x) x __attribute__((regparm(3)))
6	#define fastcall __attribute__((regparm(3)))	6	#define fastcall __attribute__((regparm(3)))
7		7
8	#ifdef CONFIG_REGPARM	8	#define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret))
9	# define prevent_tail_call(ret) __asm__ ("" : "=r" (ret) : "0" (ret))
10	#endif
11		9
12	#ifdef CONFIG_X86_ALIGNMENT_16	10	#ifdef CONFIG_X86_ALIGNMENT_16
13	#define __ALIGN .align 16,0x90	11	#define __ALIGN .align 16,0x90


diff --git a/include/asm-i386/mach-numaq/mach_ipi.h b/include/asm-i386/mach-numaq/mach_ipi.h index 1b46fd3f2ae3..c6044488e9e6 100644 --- a/include/asm-i386/mach-numaq/mach_ipi.h +++ b/include/asm-i386/mach-numaq/mach_ipi.h
@@ -1,7 +1,7 @@
1	#ifndef __ASM_MACH_IPI_H	1	#ifndef __ASM_MACH_IPI_H
2	#define __ASM_MACH_IPI_H	2	#define __ASM_MACH_IPI_H
3		3
4	inline void send_IPI_mask_sequence(cpumask_t, int vector);	4	void send_IPI_mask_sequence(cpumask_t, int vector);
5		5
6	static inline void send_IPI_mask(cpumask_t mask, int vector)	6	static inline void send_IPI_mask(cpumask_t mask, int vector)
7	{	7	{


diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h index ed13969fa2d6..41400d342d44 100644 --- a/include/asm-i386/page.h +++ b/include/asm-i386/page.h
@@ -68,6 +68,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
68	#define HPAGE_MASK (~(HPAGE_SIZE - 1))	68	#define HPAGE_MASK (~(HPAGE_SIZE - 1))
69	#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)	69	#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
70	#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA	70	#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
		71	#define ARCH_HAS_HUGETLB_CLEAN_STALE_PGTABLE
71	#endif	72	#endif
72		73
73	#define pgd_val(x) ((x).pgd)	74	#define pgd_val(x) ((x).pgd)


diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index 8d60c2b4b003..e9efe148fdf7 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h
@@ -236,6 +236,7 @@ static inline pte_t pte_mkexec(pte_t pte) { (pte).pte_low \|= _PAGE_USER; return
236	static inline pte_t pte_mkdirty(pte_t pte) { (pte).pte_low \|= _PAGE_DIRTY; return pte; }	236	static inline pte_t pte_mkdirty(pte_t pte) { (pte).pte_low \|= _PAGE_DIRTY; return pte; }
237	static inline pte_t pte_mkyoung(pte_t pte) { (pte).pte_low \|= _PAGE_ACCESSED; return pte; }	237	static inline pte_t pte_mkyoung(pte_t pte) { (pte).pte_low \|= _PAGE_ACCESSED; return pte; }
238	static inline pte_t pte_mkwrite(pte_t pte) { (pte).pte_low \|= _PAGE_RW; return pte; }	238	static inline pte_t pte_mkwrite(pte_t pte) { (pte).pte_low \|= _PAGE_RW; return pte; }
		239	static inline pte_t pte_mkhuge(pte_t pte) { (pte).pte_low \|= _PAGE_PRESENT \| _PAGE_PSE; return pte; }
239		240
240	#ifdef CONFIG_X86_PAE	241	#ifdef CONFIG_X86_PAE
241	# include <asm/pgtable-3level.h>	242	# include <asm/pgtable-3level.h>
@@ -275,7 +276,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
275	*/	276	*/
276		277
277	#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))	278	#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
278	#define mk_pte_huge(entry) ((entry).pte_low \|= _PAGE_PRESENT \| _PAGE_PSE)
279		279
280	static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)	280	static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
281	{	281	{


diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index e03a206dfa36..55ef31f66bbe 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h
@@ -51,7 +51,7 @@ extern u8 x86_cpu_to_apicid[];
51	* from the initial startup. We map APIC_BASE very early in page_setup(),	51	* from the initial startup. We map APIC_BASE very early in page_setup(),
52	* so this is correct in the x86 case.	52	* so this is correct in the x86 case.
53	*/	53	*/
54	#define __smp_processor_id() (current_thread_info()->cpu)	54	#define raw_smp_processor_id() (current_thread_info()->cpu)
55		55
56	extern cpumask_t cpu_callout_map;	56	extern cpumask_t cpu_callout_map;
57	extern cpumask_t cpu_callin_map;	57	extern cpumask_t cpu_callin_map;


diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h index 40c54f69780e..c34709849839 100644 --- a/include/asm-i386/timer.h +++ b/include/asm-i386/timer.h
@@ -53,6 +53,7 @@ extern struct init_timer_opts timer_cyclone_init;
53		53
54	extern unsigned long calibrate_tsc(void);	54	extern unsigned long calibrate_tsc(void);
55	extern void init_cpu_khz(void);	55	extern void init_cpu_khz(void);
		56	extern int recalibrate_cpu_khz(void);
56	#ifdef CONFIG_HPET_TIMER	57	#ifdef CONFIG_HPET_TIMER
57	extern struct init_timer_opts timer_hpet_init;	58	extern struct init_timer_opts timer_hpet_init;
58	extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);	59	extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);


diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index 61bcc1b1e3f4..176413fb9ae3 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h
@@ -256,7 +256,7 @@
256	#define __NR_io_submit 248	256	#define __NR_io_submit 248
257	#define __NR_io_cancel 249	257	#define __NR_io_cancel 249
258	#define __NR_fadvise64 250	258	#define __NR_fadvise64 250
259		259	#define __NR_set_zone_reclaim 251
260	#define __NR_exit_group 252	260	#define __NR_exit_group 252
261	#define __NR_lookup_dcookie 253	261	#define __NR_lookup_dcookie 253
262	#define __NR_epoll_create 254	262	#define __NR_epoll_create 254