Merge redhat.com:/garz/repo/linus-2.5

into redhat.com:/garz/repo/net-drivers-2.5

arch/i386/kernel/acpi/boot.c

@@ -26,9 +26,13 @@
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <asm/pgalloc.h>
+#include <asm/apic.h>
+#include <asm/mpspec.h>
 
+#if defined (CONFIG_X86_LOCAL_APIC)
 #include <mach_apic.h>
 #include <mach_mpparse.h>
+#endif
 
 #define PREFIX			"ACPI: "
 

arch/i386/kernel/cpu/cpufreq/powernow-k7.c

@@ -67,7 +67,7 @@ static int mobile_vid_table[32] = {
 /* divide by 10 to get FID. */
 static int fid_codes[32] = {
     110, 115, 120, 125, 50, 55, 60, 65,
-    70, 75, 80, 85, 90, 95, 10, 105, 
+    70, 75, 80, 85, 90, 95, 100, 105, 
     30, 190, 40, 200, 130, 135, 140, 210,
     150, 225, 160, 165, 170, 180, -1, -1,
 };

arch/i386/kernel/suspend.c

@@ -32,6 +32,8 @@ unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_con
 unsigned long saved_context_esp, saved_context_ebp, saved_context_esi, saved_context_edi;
 unsigned long saved_context_eflags;
 
+extern void enable_sep_cpu(void *);
+
 void save_processor_state(void)
 {
 	kernel_fpu_begin();
@@ -96,6 +98,12 @@ void restore_processor_state(void)
 	asm volatile ("lidt %0" :: "m" (saved_context.idt_limit));
 	asm volatile ("lldt %0" :: "m" (saved_context.ldt));
 
+	/*
+	 * sysenter MSRs
+	 */
+	if (boot_cpu_has(X86_FEATURE_SEP))
+		enable_sep_cpu(NULL);
+
 	fix_processor_context();
 	do_fpu_end();
 }

arch/i386/kernel/sysenter.c

@@ -35,7 +35,7 @@ struct fake_sep_struct {
 	unsigned char stack[0];
 } __attribute__((aligned(8192)));
 	
-static void __init enable_sep_cpu(void *info)
+void enable_sep_cpu(void *info)
 {
 	int cpu = get_cpu();
 	struct tss_struct *tss = init_tss + cpu;

drivers/acpi/Kconfig

@@ -76,7 +76,9 @@ config ACPI_SLEEP
 	  power management development.
 
 config ACPI_SLEEP_PROC_FS
+	bool
 	depends on ACPI_SLEEP && PROC_FS
+	default y
 
 config ACPI_AC
 	tristate "AC Adapter"

drivers/char/agp/intel-agp.c

@@ -682,6 +682,14 @@ static int intel_815_configure(void)
 	u8 temp2;
 	struct aper_size_info_8 *current_size;
 
+	/* attbase - aperture base */
+	/* the Intel 815 chipset spec. says that bits 29-31 in the
+	* ATTBASE register are reserved -> try not to write them */
+	if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK) {
+		printk (KERN_EMERG "gatt bus addr too high");
+		return -EINVAL;
+	}
+
 	current_size = A_SIZE_8(agp_bridge->current_size);
 
 	/* aperture size */
@@ -692,11 +700,6 @@ static int intel_815_configure(void)
 	pci_read_config_dword(agp_bridge->dev, INTEL_APBASE, &temp);
 	agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
 
-	/* attbase - aperture base */
-	/* the Intel 815 chipset spec. says that bits 29-31 in the
-	* ATTBASE register are reserved -> try not to write them */
-	if (agp_bridge->gatt_bus_addr & INTEL_815_ATTBASE_MASK)
-		panic("gatt bus addr too high");
 	pci_read_config_dword(agp_bridge->dev, INTEL_ATTBASE, &addr);
 	addr &= INTEL_815_ATTBASE_MASK;
 	addr |= agp_bridge->gatt_bus_addr;

fs/reiserfs/resize.c

@@ -118,8 +118,8 @@ int reiserfs_resize (struct super_block * s, unsigned long block_count_new)
 		memset(bitmap[i].bh->b_data, 0, sb_blocksize(sb));
 		reiserfs_test_and_set_le_bit(0, bitmap[i].bh->b_data);
 
-		mark_buffer_dirty(bitmap[i].bh) ;
 		set_buffer_uptodate(bitmap[i].bh);
+		mark_buffer_dirty(bitmap[i].bh) ;
 		sync_dirty_buffer(bitmap[i].bh);
 		// update bitmap_info stuff
 		bitmap[i].first_zero_hint=1;