cpufreq/linux/arch/i386/kernel/cpufreq Kconfig,1.6,1.7 Makefile,1.11,1.12 acpi.c,1.6,1.7 speedstep-piix4.c,1.6,1.7

Update of /mnt/src/cvsroot/cpufreq/linux/arch/i386/kernel/cpufreq In directory flint:/tmp/cvs-serv32624

Modified Files:
Kconfig Makefile acpi.c speedstep-piix4.c
Log Message:
It's time for me to buy a brown bag.

Index: Kconfig
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/i386/kernel/cpufreq/Kconfig,v retrieving revision 1.6
retrieving revision 1.7

diff -u -r1.6 -r1.7
@@ -42,6 +42,11 @@
 
 	  If in doubt, say N.
 
+config X86_ACPI_LIB
+       tristate
+       depends on X86_ACPI_CPUFREQ
+       default X86_ACPI_CPUFREQ
+
 config X86_ACPI_CPUFREQ_PROC_INTF
         bool "/proc/acpi/processor/../performance interface (deprecated)"
 	depends on X86_ACPI_CPUFREQ && PROC_FS

Index: Makefile
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/i386/kernel/cpufreq/Makefile,v retrieving revision 1.11
retrieving revision 1.12

diff -u -r1.11 -r1.12
@@ -6,6 +6,7 @@
 obj-$(CONFIG_X86_LONGRUN)	+= longrun.o  
 obj-$(CONFIG_X86_GX_SUSPMOD)	+= gx-suspmod.o
 obj-$(CONFIG_X86_ACPI_CPUFREQ)	+= acpi.o
+obj-$(CONFIG_X86_ACPI_LIB)	+= acpi-lib.o
 obj-$(CONFIG_X86_SPEEDSTEP_PIIX4)	+= speedstep-piix4.o
 obj-$(CONFIG_X86_SPEEDSTEP_ICH)	+= speedstep-ich.o
 obj-$(CONFIG_X86_SPEEDSTEP_LIB) += speedstep-lib.o

Index: acpi.c
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/i386/kernel/cpufreq/acpi.c,v retrieving revision 1.6
retrieving revision 1.7

Index: speedstep-piix4.c
===================================================================
RCS file: /mnt/src/cvsroot/cpufreq/linux/arch/i386/kernel/cpufreq/speedstep-piix4.c,v retrieving revision 1.6
retrieving revision 1.7

diff -u -r1.6 -r1.7
@@ -124,8 +124,9 @@
 	value = inb_p(pmbase + gpo_hilo_port);
 
 	/* compute new state */
-	value &= ~(1 << gpo_hilo_shift);
-	value |= state << gpo_hilo_shift;
+	value = state ? (value | (1 << gpo_hilo_shift)) : \
+		        (value & ~(1 << gpo_hilo_shift));
+
 
 	/* disable bus master arbitration */
 	pm2_blk = inb(0x22);

I am so sorry, I wanted only to commit speedstep stuff...

I revert irrelevant files..

Ducrot Bruno

--  Which is worse:  ignorance or apathy?
--  Don't know.  Don't care.