v2.4.9 -> v2.4.9.1

  - Jeff Hartmann: DRM AGP/alpha cleanups
  - Ben LaHaise: highmem user pagecopy/clear optimization
  - Vojtech Pavlik: VIA IDE driver update
  - Herbert Xu: make cramfs work with HIGHMEM pages
  - David Fennell: awe32 ram size detection improvement
  - Istvan Varadi: umsdos EMD filename bug fix
  - Keith Owens: make min/max work for pointers too
  - Jan Kara: quota initialization fix
  - Brad Hards: Kaweth USB driver update (enable, and fix endianness)
  - Ralf Baechle: MIPS updates
  - David Gibson: airport driver update
  - Rogier Wolff: firestream ATM driver multi-phy support
  - Daniel Phillips: swap read page referenced set - avoid swap thrashing

4 files changed, 19 insertions, 8 deletions

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 63619c2eb6f6..fef8b4776e95 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -85,6 +85,8 @@ typedef struct _agp_kern_info {
 	size_t aper_size;
 	int max_memory;		/* In pages */
 	int current_memory;
+	int cant_use_aperture;
+	unsigned long page_mask;
 } agp_kern_info;
 
 /* 
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index de8eea018272..abc5e29d95b9 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -45,8 +45,9 @@ static inline void *kmap(struct page *page) { return page_address(page); }
 /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */
 static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-	clear_user_page(kmap(page), vaddr);
-	kunmap(page);
+	void *addr = kmap_atomic(page, KM_USER0);
+	clear_user_page(addr, vaddr);
+	kunmap_atomic(addr, KM_USER0);
 }
 
 static inline void clear_highpage(struct page *page)
@@ -85,11 +86,11 @@ static inline void copy_user_highpage(struct page *to, struct page *from, unsign
 {
 	char *vfrom, *vto;
 
-	vfrom = kmap(from);
-	vto = kmap(to);
+	vfrom = kmap_atomic(from, KM_USER0);
+	vto = kmap_atomic(to, KM_USER1);
 	copy_user_page(vto, vfrom, vaddr);
-	kunmap(from);
-	kunmap(to);
+	kunmap_atomic(vfrom, KM_USER0);
+	kunmap_atomic(vto, KM_USER1);
 }
 
 static inline void copy_highpage(struct page *to, struct page *from)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index bafb80e8cae2..b9fc98184d11 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -113,9 +113,9 @@ static inline void console_verbose(void)
 	((unsigned char *)&addr)[0]
 
 #define min(type,x,y) \
-	({ type __x = (x), __y = (y); __x < __y ? __x: __y; })
+	({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
 #define max(type,x,y) \
-	({ type __x = (x), __y = (y); __x > __y ? __x: __y; })
+	({ type __x = (x); type __y = (y); __x > __y ? __x: __y; })
 
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a17b5ca29623..f6ca445b882e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -985,6 +985,7 @@
 #define PCI_VENDOR_ID_PHILIPS		0x1131
 #define PCI_DEVICE_ID_PHILIPS_SAA7145	0x7145
 #define PCI_DEVICE_ID_PHILIPS_SAA7146	0x7146
+#define PCI_DEVICE_ID_PHILIPS_SAA9730	0x9730
 
 #define PCI_VENDOR_ID_EICON		0x1133
 #define PCI_DEVICE_ID_EICON_DIVA20PRO	0xe001
@@ -1098,6 +1099,9 @@
 
 #define PCI_VENDOR_ID_GALILEO		0x11ab
 #define PCI_DEVICE_ID_GALILEO_GT64011	0x4146
+#define PCI_DEVICE_ID_GALILEO_GT64111	0x4146
+#define PCI_DEVICE_ID_GALILEO_GT96100	0x9652
+#define PCI_DEVICE_ID_GALILEO_GT96100A	0x9653
 
 #define PCI_VENDOR_ID_LITEON		0x11ad
 #define PCI_DEVICE_ID_LITEON_LNE100TX	0x0002
@@ -1230,6 +1234,10 @@
 
 #define PCI_VENDOR_ID_ITE		0x1283
 #define PCI_DEVICE_ID_ITE_IT8172G	0x8172
+#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
+
+#define PCI_VENDOR_ID_ITE		0x1283
+#define PCI_DEVICE_ID_ITE_IT8172G	0x8172
 
 /* formerly Platform Tech */
 #define PCI_VENDOR_ID_ESS_OLD		0x1285