Merge bk://linux-dj.bkbits.net/agpgart

into home.transmeta.com:/home/torvalds/v2.5/linux

CREDITS

@@ -1272,11 +1272,13 @@ S: Germany
 
 N: Christoph Hellwig
 E: hch@infradead.org
-D: misc driver & makefile hacking
+E: hch@sgi.com
+D: all kinds of driver, filesystem & core kernel hacking
 D: freevxfs driver
 D: sysvfs maintainer
-S: Triftstrae 26
-S: 38644 Goslar
+D: chief codingstyle nitpicker
+S: Auweg 38
+S: 85748 Garching
 S: Germany
 
 N: Richard Henderson

Documentation/devices.txt

@@ -97,6 +97,7 @@ Your cooperation is appreciated.
 		  8 = /dev/random	Nondeterministic random number gen.
 		  9 = /dev/urandom	Faster, less secure random number gen.
 		 10 = /dev/aio		Asyncronous I/O notification interface
+		 11 = /dev/kmsg		Writes to this come out as printk's
     block	RAM disk
 		  0 = /dev/ram0		First RAM disk
 		  1 = /dev/ram1		Second RAM disk

Documentation/filesystems/Locking

@@ -92,6 +92,7 @@ prototypes:
 	void (*delete_inode) (struct inode *);
 	void (*put_super) (struct super_block *);
 	void (*write_super) (struct super_block *);
+	void (*sync_fs) (struct super_block *sb, int wait);
 	int (*statfs) (struct super_block *, struct statfs *);
 	int (*remount_fs) (struct super_block *, int *, char *);
 	void (*clear_inode) (struct inode *);
@@ -108,6 +109,7 @@ delete_inode:	no
 clear_inode:	no	
 put_super:	yes	yes	maybe		(see below)
 write_super:	no	yes	maybe		(see below)
+sync_fs:	no	no	maybe		(see below)
 statfs:		no	no	no
 remount_fs:	yes	yes	maybe		(see below)
 umount_begin:	yes	no	maybe		(see below)
@@ -131,10 +133,10 @@ unlocks and drops the reference.
 
 --------------------------- address_space_operations --------------------------
 prototypes:
-	int (*writepage)(struct page *);
+	int (*writepage)(struct page *page, struct writeback_control *wbc);
 	int (*readpage)(struct file *, struct page *);
 	int (*sync_page)(struct page *);
-	int (*writepages)(struct address_space *, int *nr_to_write);
+	int (*writepages)(struct address_space *, struct writeback_control *);
 	int (*set_page_dirty)(struct page *page);
 	int (*prepare_write)(struct file *, struct page *, unsigned, unsigned);
 	int (*commit_write)(struct file *, struct page *, unsigned, unsigned);
@@ -147,7 +149,7 @@ locking rules:
 	All except set_page_dirty may block
 
 			BKL	PageLocked(page)
-writepage:		no	yes, unlocks
+writepage:		no	yes, unlocks (see below)
 readpage:		no	yes, unlocks
 readpages:		no
 sync_page:		no	maybe
@@ -165,16 +167,38 @@ may be called from the request handler (/dev/loop).
 	->readpage() unlocks the page, either synchronously or via I/O
 completion.
 
-	->readpages() populates the pagecache with the passed pages and starts I/O against them.  They come unlocked upon I/O completion.
+	->readpages() populates the pagecache with the passed pages and starts
+I/O against them.  They come unlocked upon I/O completion.
 
-	->writepage() unlocks the page synchronously, before returning to
-the caller.  If the page has write I/O underway against it, writepage()
-should run SetPageWriteback() against the page prior to unlocking it.
-The write I/O completion handler should run ClearPageWriteback against
-the page.
+	->writepage() is used for two purposes: for "memory cleansing" and for
+"sync".  These are quite different operations and the behaviour may differ
+depending upon the mode.
 
-	That is: after 2.5.12, pages which are under writeout are *not*
-locked.
+If writepage is called for sync (wbc->sync_mode != WBC_SYNC_NONE) then
+it *must* start I/O against the page, even if that would involve
+blocking on in-progress I/O.
+
+If writepage is called for memory cleansing (sync_mode ==
+WBC_SYNC_NONE) then its role is to get as much writeout underway as
+possible.  So writepage should try to avoid blocking against
+currently-in-progress I/O.
+
+If the filesystem is not called for "sync" and it determines that it
+would need to block against in-progress I/O to be able to start new I/O
+against the page the filesystem shoud redirty the page (usually with
+__set_page_dirty_nobuffers()), then unlock the page and return zero. 
+This may also be done to avoid internal deadlocks, but rarely.
+
+If the filesytem is called for sync then it must wait on any
+in-progress I/O and then start new I/O.
+
+The filesystem should unlock the page synchronously, before returning
+to the caller.  If the page has write I/O underway against it,
+writepage() should run SetPageWriteback() against the page prior to
+unlocking it.  The write I/O completion handler should run
+end_page_writeback() against the page.
+
+That is: after 2.5.12, pages which are under writeout are *not* locked.
 
 	->sync_page() locking rules are not well-defined - usually it is called
 with lock on page, but that is not guaranteed. Considering the currently
@@ -188,6 +212,9 @@ written.  The address_space implementation may write more (or less) pages
 than *nr_to_write asks for, but it should try to be reasonably close.  If
 nr_to_write is NULL, all dirty pages must be written.
 
+writepages should _only_ write pages which are present on
+mapping->io_pages.
+
 	->set_page_dirty() is called from various places in the kernel
 when the target page is marked as needing writeback.  It may be called
 under spinlock (it cannot block) and is sometimes called with the page

Documentation/filesystems/proc.txt

@@ -989,42 +989,58 @@ for writeout by the pdflush daemons.  It is expressed in 100'ths of a second.
 Data which has been dirty in-memory for longer than this interval will be
 written out next time a pdflush daemon wakes up.
 
+lower_zone_protection
+---------------------
 
-kswapd
-------
+For some specialised workloads on highmem machines it is dangerous for
+the kernel to allow process memory to be allocated from the "lowmem"
+zone.  This is because that memory could then be pinned via the mlock()
+system call, or by unavailability of swapspace.
 
-Kswapd is  the  kernel  swap  out daemon. That is, kswapd is that piece of the
-kernel that  frees  memory when it gets fragmented or full. Since every system
-is different, you'll probably want some control over this piece of the system.
+And on large highmem machines this lack of reclaimable lowmem memory
+can be fatal.
 
-The file contains three numbers:
+So the Linux page allocator has a mechanism which prevents allocations
+which _could_ use highmem from using too much lowmem.  This means that
+a certain amount of lowmem is defended from the possibility of being
+captured into pinned user memory.
 
-tries_base
-----------
+(The same argument applies to the old 16 megabyte ISA DMA region.  This
+mechanism will also defend that region from allocations which could use
+highmem or lowmem).
 
-The maximum  number  of  pages kswapd tries to free in one round is calculated
-from this  number.  Usually  this  number  will  be  divided  by  4  or 8 (see
-mm/vmscan.c), so it isn't as big as it looks.
+The `lower_zone_protection' tunable determines how aggressive the kernel is
+in defending these lower zones.  The default value is zero - no
+protection at all.
 
-When you  need to increase the bandwidth to/from swap, you'll want to increase
-this number.
+If you have a machine which uses highmem or ISA DMA and your
+applications are using mlock(), or if you are running with no swap then
+you probably should increase the lower_zone_protection setting.
 
-tries_min
----------
+The units of this tunable are fairly vague.  It is approximately equal
+to "megabytes".  So setting lower_zone_protection=100 will protect around 100
+megabytes of the lowmem zone from user allocations.  It will also make
+those 100 megabytes unavaliable for use by applications and by
+pagecache, so there is a cost.
+
+The effects of this tunable may be observed by monitoring
+/proc/meminfo:LowFree.  Write a single huge file and observe the point
+at which LowFree ceases to fall.
 
-This is  the  minimum number of times kswapd tries to free a page each time it
-is called. Basically it's just there to make sure that kswapd frees some pages
-even when it's being called with minimum priority.
+A reasonable value for lower_zone_protection is 100.
 
-swap_cluster
+page-cluster
 ------------
 
-This is probably the greatest influence on system performance.
+page-cluster controls the number of pages which are written to swap in
+a single attempt.  The swap I/O size.
+
+It is a logarithmic value - setting it to zero means "1 page", setting
+it to 1 means "2 pages", setting it to 2 means "4 pages", etc.
 
-swap_cluster is  the  number  of  pages kswapd writes in one turn. You'll want
-this value  to  be  large  so that kswapd does its I/O in large chunks and the
-disk doesn't  have  to  seek  as  often, but you don't want it to be too large
-since that would flood the request queue.
+The default value is three (eight pages at a time).  There may be some
+small benefits in tuning this to a different value if your workload is
+swap-intensive.
 
 overcommit_memory
 -----------------

Documentation/filesystems/vfs.txt

@@ -264,7 +264,7 @@ struct inode_operations {
 	int (*readlink) (struct dentry *, char *,int);
 	struct dentry * (*follow_link) (struct dentry *, struct dentry *);
 	int (*readpage) (struct file *, struct page *);
-	int (*writepage) (struct file *, struct page *);
+	int (*writepage) (struct page *page, struct writeback_control *wbc);
 	int (*bmap) (struct inode *,int);
 	void (*truncate) (struct inode *);
 	int (*permission) (struct inode *, int);

Documentation/scsi/st.txt

 This file contains brief information about the SCSI tape driver.
-The driver is currently maintained by Kai M{kisara (email
+The driver is currently maintained by Kai Mäkisara (email
 Kai.Makisara@metla.fi)
 
-Last modified: Fri Jul 26 16:01:39 2002 by makisara
+Last modified: Sat Dec 14 14:35:30 2002 by makisara
 
 
 BASICS
@@ -89,7 +89,10 @@ The compile options are defined in the file linux/drivers/scsi/st_options.h.
 4. If the open option O_NONBLOCK is used, open succeeds even if the
 drive is not ready. If O_NONBLOCK is not used, the driver waits for
 the drive to become ready. If this does not happen in ST_BLOCK_SECONDS
-seconds, open fails with the errno value EIO.
+seconds, open fails with the errno value EIO. With O_NONBLOCK the
+device can be opened for writing even if there is a write protected
+tape in the drive (commands trying to write something return error if
+attempted).
 
 
 BSD AND SYS V SEMANTICS

Documentation/sysctl/kernel.txt

@@ -237,11 +237,6 @@ the different loglevels.
   console_loglevel can be set
 - default_console_loglevel: default value for console_loglevel
 
-Note: a quick look in linux/kernel/printk.c will reveal that
-these variables aren't put inside a structure, so their order
-in-core isn't formally guaranteed and garbage values _might_
-occur when the compiler changes. (???)
-
 ==============================================================
 
 reboot-cmd: (Sparc only)

Makefile

 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 51
+SUBLEVEL = 52
 EXTRAVERSION =
 
 # *DOCUMENTATION*

Rules.make

-

arch/alpha/kernel/Makefile

@@ -92,5 +92,3 @@ obj-y    += irq_pyxis.o
 endif
 
 endif # GENERIC
-
-include $(TOPDIR)/Rules.make

arch/alpha/lib/Makefile

@@ -49,8 +49,6 @@ obj-y =	__divqu.o __remqu.o __divlu.o __remlu.o \
 
 obj-$(CONFIG_SMP) += dec_and_lock.o
 
-include $(TOPDIR)/Rules.make
-
 $(obj)/__divqu.o: $(obj)/$(ev6)divide.S
 	$(CC) $(AFLAGS) -DDIV -c -o $(obj)/__divqu.o $(obj)/$(ev6)divide.S
 

arch/alpha/math-emu/Makefile

@@ -5,5 +5,3 @@
 CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
 
 obj-$(CONFIG_MATHEMU) += math.o qrnnd.o
-
-include $(TOPDIR)/Rules.make

arch/alpha/mm/Makefile

@@ -5,5 +5,3 @@
 obj-y	:= init.o fault.o extable.o
 
 obj-$(CONFIG_DISCONTIGMEM) += numa.o
-
-include $(TOPDIR)/Rules.make

arch/arm/kernel/Makefile

@@ -40,8 +40,6 @@ endif
 
 EXTRA_TARGETS := $(head-y) init_task.o
 
-include $(TOPDIR)/Rules.make
-
 # Spell out some dependencies that `make dep' doesn't spot
 $(obj)/entry-armv.o: 	$(obj)/entry-header.S include/asm-arm/constants.h
 $(obj)/entry-armo.o: 	$(obj)/entry-header.S include/asm-arm/constants.h

arch/arm/lib/Makefile

@@ -41,8 +41,6 @@ obj-y		+= io-writesl.o
 
 obj-$(CONFIG_CPU_26) += uaccess-armo.o
 
-include $(TOPDIR)/Rules.make
-
 $(obj)/csumpartialcopy.o:	$(obj)/csumpartialcopygeneric.S
 $(obj)/csumpartialcopyuser.o:	$(obj)/csumpartialcopygeneric.S
 

arch/arm/mach-adifcc/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:=
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-anakin/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-arc/Makefile

@@ -17,5 +17,3 @@ obj-$(CONFIG_DEBUG_LL)	+= debug.o
 EXTRA_TARGETS 		:= head.o
 
 AFLAGS_head.o		:= -DTEXTADDR=$(TEXTADDR)
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-clps711x/Makefile

@@ -18,5 +18,3 @@ obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o
 obj-$(CONFIG_ARCH_P720T)    += p720t.o
 leds-$(CONFIG_ARCH_P720T)   += p720t-leds.o
 obj-$(CONFIG_LEDS)          += $(leds-y)
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-clps7500/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-ebsa110/Makefile

@@ -12,5 +12,3 @@ obj-			:=
 export-objs		:= io.o
 
 obj-$(CONFIG_LEDS)	+= leds.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-epxa10db/Makefile

@@ -10,6 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-footbridge/Makefile

@@ -25,5 +25,3 @@ obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o
 
 obj-$(CONFIG_PCI)	+=$(pci-y)
 obj-$(CONFIG_LEDS)	+=$(leds-y)
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-ftvpci/Makefile

@@ -13,5 +13,3 @@ export-objs		:=
 
 obj-$(CONFIG_PCI)	+= pci.o
 obj-$(CONFIG_LEDS)	+= leds.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-integrator/Makefile

@@ -11,5 +11,3 @@ obj-			:=
 
 obj-$(CONFIG_LEDS)	+= leds.o
 obj-$(CONFIG_PCI)	+= pci_v3.o pci.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-integrator/cpu.c

@@ -77,8 +77,8 @@ static int integrator_verify_speed(struct cpufreq_policy *policy)
 {
 	struct vco vco;
 
-	if (policy->max > policy->max_cpu_freq)
-		policy->max = policy->max_cpu_freq;
+	if (policy->max > policy->cpuinfo.max_freq)
+		policy->max = policy->cpuinfo.max_freq;
 
 	if (policy->max < 12000)
 		policy->max = 12000;
@@ -148,7 +148,9 @@ static int integrator_set_policy(struct cpufreq_policy *policy)
 static struct cpufreq_policy integrator_policy = {
 	.cpu		= 0,
 	.policy		= CPUFREQ_POLICY_POWERSAVE,
-	.max_cpu_freq	= 160000,
+	.cpuinfo.max_cpu_freq	= 160000,
+	.cpuinfo.min_cpu_freq   = 12000,
+	.cpuinfo.transition_latency  = CPUFREQ_ETERNAL,
 };
 
 static struct cpufreq_driver integrator_driver = {
@@ -197,7 +199,9 @@ static int __init integrator_cpu_init(void)
 
 		policies[cpu].cpu = cpu;
 		policies[cpu].policy = CPUFREQ_POLICY_POWERSAVE,
-		policies[cpu].max_cpu_freq = 160000;
+		policies[cpu].cpuinfo.max_freq = 160000;
+		policies[cpu].cpuinfo.min_freq = 12000;
+		policies[cpu].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 		policies[cpu].min =
 		policies[cpu].max = vco_to_freq(vco, 1);
 	}
@@ -205,8 +209,6 @@ static int __init integrator_cpu_init(void)
 	set_cpus_allowed(current, cpus_allowed);
 
 #ifdef CONFIG_CPU_FREQ
-	for (cpu=0; cpu<NR_CPUS; cpu++)
-		integrator_driver.cpu_min_freq[cpu] = 12000;
 	integrator_driver.policy = policies;
 	cpufreq_register(&integrator_driver);
 #else

arch/arm/mach-iop310/Makefile

@@ -22,5 +22,3 @@ obj-$(CONFIG_IOP310_AAU) += aau.o
 obj-$(CONFIG_IOP310_DMA) += dma.o
 obj-$(CONFIG_IOP310_MU) += message.o
 obj-$(CONFIG_IOP310_PMON) += pmon.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-l7200/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-pxa/Makefile

@@ -21,5 +21,3 @@ obj-$(CONFIG_LEDS) += $(leds-y)
 
 # Misc features
 obj-$(CONFIG_PM) += pm.o sleep.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-rpc/Makefile

@@ -10,6 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-sa1100/Makefile

@@ -108,5 +108,3 @@ obj-$(CONFIG_LEDS) += $(led-y)
 
 # Miscelaneous functions
 obj-$(CONFIG_PM) += pm.o sleep.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-sa1100/cpu-sa1100.c

@@ -203,14 +203,15 @@ static int sa1100_setspeed(struct cpufreq_policy *policy)
 static struct cpufreq_policy sa1100_policy = {
 	.cpu		= 0,
 	.policy		= CPUFREQ_POLICY_POWERSAVE,
-	.max_cpu_freq	= 287000,
+	.cpuinfo.max_freq	= 287000,
+	.cpuinfo.min_freq	= 59000,
+	.cpuinfo.transition_latency	= CPUFREQ_ETERNAL,
 };
 
 static struct cpufreq_driver sa1100_driver = {
 	.verify		= sa11x0_verify_speed,
 	.setpolicy	= sa1100_setspeed,
 	.policy		= &sa1100_policy,
-	.cpu_min_freq[0]= 59000,
 };
 
 static int __init sa1100_dram_init(void)

arch/arm/mach-sa1100/cpu-sa1110.c

@@ -298,14 +298,15 @@ static int sa1110_setspeed(struct cpufreq_policy *policy)
 static struct cpufreq_policy sa1110_policy = {
 	.cpu		= 0,
 	.policy		= CPUFREQ_POLICY_POWERSAVE,
-	.max_cpu_freq	= 287000,
+	.cpuinfo.max_freq	= 287000,
+	.cpuinfo.min_freq	= 59000,
+	.cpuinfo.transition_latency	= CPUFREQ_ETERNAL,
 };
 
 static struct cpufreq_driver sa1110_driver = {
 	.verify		 = sa11x0_verify_speed,
 	.setpolicy	 = sa1110_setspeed,
 	.policy		 = &sa1110_policy,
-	.cpu_min_freq	 = { 59000, },
 };
 
 static int __init sa1110_clk_init(void)

arch/arm/mach-sa1100/generic.c

@@ -69,8 +69,8 @@ unsigned int sa11x0_freq_to_ppcr(unsigned int khz)
  */
 int sa11x0_verify_speed(struct cpufreq_policy *policy)
 {
-	if (policy->max > policy->max_cpu_freq)
-		policy->max = policy->max_cpu_freq;
+	if (policy->max > policy->cpuinfo.max_freq)
+		policy->max = policy->cpuinfo.max_freq;
 
 	policy->max = cclk_frequency_100khz[sa11x0_freq_to_ppcr(policy->max)] * 100;
 	policy->min = policy->max;

arch/arm/mach-shark/Makefile

@@ -12,5 +12,3 @@ obj-			:=
 export-objs		:= 
 
 obj-$(CONFIG_LEDS)	+= leds.o
-
-include $(TOPDIR)/Rules.make

arch/arm/mach-tbox/Makefile

@@ -10,5 +10,3 @@ obj-n			:=
 obj-			:=
 
 export-objs		:= 
-
-include $(TOPDIR)/Rules.make

arch/arm/mm/Makefile

@@ -38,5 +38,3 @@ p-$(CONFIG_CPU_ARM926T)	+= proc-arm926.o  tlb-v4wbi.o copypage-v4wb.o abort-ev5t
 p-$(CONFIG_CPU_XSCALE)	+= proc-xscale.o  tlb-v4wbi.o copypage-xscale.o abort-xscale.o minicache.o
 
 obj-y		+= $(sort $(p-y))
-
-include $(TOPDIR)/Rules.make

arch/arm/nwfpe/Makefile

@@ -17,5 +17,3 @@ nwfpe-objs		+= entry26.o
 else
 nwfpe-objs		+= entry.o
 endif
-
-include $(TOPDIR)/Rules.make

arch/cris/drivers/Makefile

@@ -14,6 +14,3 @@ obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)  += sync_serial.o
 obj-$(CONFIG_ETRAX_PARPORT)             += parport.o
 obj-$(CONFIG_ETRAX_DS1302)              += ds1302.o
 obj-$(CONFIG_ETRAX_ETHERNET_LPSLAVE)    += lpslave
-
-include $(TOPDIR)/Rules.make
-

arch/cris/drivers/lpslave/Makefile

@@ -4,8 +4,6 @@
 
 obj-y = e100lpslavenet.o e100lpslave_code.o
 
-include $(TOPDIR)/Rules.make
-
 e100lpslave_code.o:	e100lpslave.o e100lpslaveld 
 	$(CROSS_COMPILE)ld -qmagic -Te100lpslaveld e100lpslave.o -o e100lpslave
 	$(CROSS_COMPILE)objcopy -O binary --remove-section=.data --remove-section=.bss e100lpslave e100lpslave.text

arch/cris/kernel/Makefile

@@ -21,5 +21,3 @@ entryoffsets.s: entryoffsets.c
 	$(CC) $(CFLAGS) -S -c $<
 
 clean:
-
-include $(TOPDIR)/Rules.make

arch/cris/lib/Makefile

@@ -7,5 +7,3 @@ L_TARGET = lib.a
 EXTRA_AFLAGS := -traditional
 
 obj-y  = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
-
-include $(TOPDIR)/Rules.make

arch/cris/mm/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y	 := init.o fault.o tlb.o extable.o ioremap.o
-
-include $(TOPDIR)/Rules.make

arch/i386/Kconfig

@@ -465,104 +465,6 @@ config X86_MCE_P4THERMAL
 	  Enabling this feature will cause a message to be printed when the P4
 	  enters thermal throttling.
 
-config CPU_FREQ
-	bool "CPU Frequency scaling"
-	help
-	  Clock scaling allows you to change the clock speed of CPUs on the
-	  fly. This is a nice method to save battery power on notebooks,
-	  because the lower the clock speed, the less power the CPU consumes.
-
-	  For more information, take a look at linux/Documentation/cpufreq or
-	  at <http://www.brodo.de/cpufreq/>
-
-	  If in doubt, say N.
-
-config CPU_FREQ_24_API
-	bool "/proc/sys/cpu/ interface (2.4. / OLD)"
-	depends on CPU_FREQ
-	help
-	  This enables the /proc/sys/cpu/ sysctl interface for controlling
-	  CPUFreq, as known from the 2.4.-kernel patches for CPUFreq. 2.5
-	  uses /proc/cpufreq instead. Please note that some drivers do not 
-	  work well with the 2.4. /proc/sys/cpu sysctl interface, so if in
-	  doubt, say N here.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_POWERNOW_K6
-	tristate "AMD Mobile K6-2/K6-3 PowerNow!"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
-	  AMD K6-3+ processors.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config ELAN_CPUFREQ
-	tristate "AMD Elan"
-	depends on CPU_FREQ && MELAN
-	---help---
-	  This adds the CPUFreq driver for AMD Elan SC400 and SC410
-	  processors.
-
-	  You need to specify the processor maximum speed as boot
-	  parameter: elanfreq=maxspeed (in kHz) or as module
-	  parameter "max_freq".
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_LONGHAUL
-	tristate "VIA Cyrix III Longhaul"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for VIA Samuel/CyrixIII, 
-	  VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T 
-	  processors.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_SPEEDSTEP
-	tristate "Intel Speedstep"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for certain mobile Intel Pentium III
-	  (Coppermine), all mobile Intel Pentium III-M (Tulatin) and all
-	  mobile Intel Pentium 4 P4-Ms.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_P4_CLOCKMOD
-	tristate "Intel Pentium 4 clock modulation"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for Intel Pentium 4 / XEON
-	  processors.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
-config X86_LONGRUN
-	tristate "Transmeta LongRun"
-	depends on CPU_FREQ
-	help
-	  This adds the CPUFreq driver for Transmeta Crusoe processors which
-	  support LongRun.
-
-	  For details, take a look at linux/Documentation/cpufreq. 
-
-	  If in doubt, say N.
-
 config TOSHIBA
 	tristate "Toshiba Laptop support"
 	---help---
@@ -985,6 +887,104 @@ config APM_REAL_MODE_POWER_OFF
 	  a work-around for a number of buggy BIOSes. Switch this option on if
 	  your computer crashes instead of powering off properly.
 
+config CPU_FREQ
+	bool "CPU Frequency scaling"
+	help
+	  Clock scaling allows you to change the clock speed of CPUs on the
+	  fly. This is a nice method to save battery power on notebooks,
+	  because the lower the clock speed, the less power the CPU consumes.
+
+	  For more information, take a look at linux/Documentation/cpufreq or
+	  at <http://www.brodo.de/cpufreq/>
+
+	  If in doubt, say N.
+
+config CPU_FREQ_24_API
+	bool "/proc/sys/cpu/ interface (2.4. / OLD)"
+	depends on CPU_FREQ
+	help
+	  This enables the /proc/sys/cpu/ sysctl interface for controlling
+	  CPUFreq, as known from the 2.4.-kernel patches for CPUFreq. 2.5
+	  uses /proc/cpufreq instead. Please note that some drivers do not 
+	  work well with the 2.4. /proc/sys/cpu sysctl interface, so if in
+	  doubt, say N here.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_POWERNOW_K6
+	tristate "AMD Mobile K6-2/K6-3 PowerNow!"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
+	  AMD K6-3+ processors.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config ELAN_CPUFREQ
+	tristate "AMD Elan"
+	depends on CPU_FREQ && MELAN
+	---help---
+	  This adds the CPUFreq driver for AMD Elan SC400 and SC410
+	  processors.
+
+	  You need to specify the processor maximum speed as boot
+	  parameter: elanfreq=maxspeed (in kHz) or as module
+	  parameter "max_freq".
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_LONGHAUL
+	tristate "VIA Cyrix III Longhaul"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for VIA Samuel/CyrixIII, 
+	  VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T 
+	  processors.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_SPEEDSTEP
+	tristate "Intel Speedstep"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for certain mobile Intel Pentium III
+	  (Coppermine), all mobile Intel Pentium III-M (Tulatin) and all
+	  mobile Intel Pentium 4 P4-Ms.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_P4_CLOCKMOD
+	tristate "Intel Pentium 4 clock modulation"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for Intel Pentium 4 / XEON
+	  processors.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
+config X86_LONGRUN
+	tristate "Transmeta LongRun"
+	depends on CPU_FREQ
+	help
+	  This adds the CPUFreq driver for Transmeta Crusoe processors which
+	  support LongRun.
+
+	  For details, take a look at linux/Documentation/cpufreq. 
+
+	  If in doubt, say N.
+
 endmenu
 
 

arch/i386/boot/compressed/Makefile

@@ -7,8 +7,6 @@
 EXTRA_TARGETS	:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
 EXTRA_AFLAGS	:= -traditional
 
-include $(TOPDIR)/Rules.make
-
 LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
 
 $(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE

arch/i386/kernel/Makefile

@@ -34,5 +34,3 @@ EXTRA_AFLAGS   := -traditional
 
 export-objs += scx200.o
 obj-$(CONFIG_SCx200)		+= scx200.o
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/acpi.c

@@ -448,10 +448,11 @@ acpi_boot_init (
 
 /* address in low memory of the wakeup routine. */
 unsigned long acpi_wakeup_address = 0;
+extern char wakeup_start, wakeup_end;
 
 extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
 
-static void init_low_mapping(pgd_t *pgd, int pgd_ofs, int pgd_limit)
+static void init_low_mapping(pgd_t *pgd, int pgd_limit)
 {
 	int pgd_ofs = 0;
 
@@ -473,7 +474,8 @@ int acpi_save_state_mem (void)
 	panic("S3 and PAE do not like each other for now.");
 	return 1;
 #endif
-	init_low_mapping(swapper_pg_dir, 0, USER_PTRS_PER_PGD);
+	init_low_mapping(swapper_pg_dir, USER_PTRS_PER_PGD);
+	memcpy((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start);
 	acpi_copy_wakeup_routine(acpi_wakeup_address);
 
 	return 0;
@@ -506,7 +508,6 @@ void acpi_restore_state_mem (void)
  */
 void __init acpi_reserve_bootmem(void)
 {
-	extern char wakeup_start, wakeup_end;
 	acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE);
 	if ((&wakeup_end - &wakeup_start) > PAGE_SIZE)
 		printk(KERN_CRIT "ACPI: Wakeup code way too big, will crash on attempt to suspend\n");

arch/i386/kernel/acpi_wakeup.S

@@ -239,20 +239,11 @@ bogus_magic2:
 #
 ENTRY(acpi_copy_wakeup_routine)
 
-	pushl	%esi
-	pushl	%edi
-
 	sgdt	saved_gdt
 	sidt	saved_idt
 	sldt	saved_ldt
 	str	saved_tss
 
-	movl	%eax, %edi
-	leal	wakeup_start, %esi
-	movl	$(wakeup_end - wakeup_start + 3) >> 2, %ecx
-
-	rep ;  movsl
-
 	movl    %cr3, %edx
 	movl    %edx, real_save_cr3 - wakeup_start (%eax)
 	movl    %cr4, %edx
@@ -265,10 +256,6 @@ ENTRY(acpi_copy_wakeup_routine)
 	movl	%edx, video_mode - wakeup_start (%eax)
 	movl	$0x12345678, real_magic - wakeup_start (%eax)
 	movl	$0x12345678, saved_magic
-
-	# restore the regs we used
-	popl	%edi
-	popl	%esi
 	ret
 
 .data

arch/i386/kernel/cpu/Makefile

@@ -17,6 +17,3 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
 
 obj-$(CONFIG_MTRR)	+= 	mtrr/
 obj-$(CONFIG_CPU_FREQ)	+=	cpufreq/
-
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/cpu/cpufreq/Makefile

@@ -4,5 +4,3 @@ obj-$(CONFIG_X86_SPEEDSTEP)	+= speedstep.o
 obj-$(CONFIG_X86_P4_CLOCKMOD)	+= p4-clockmod.o
 obj-$(CONFIG_ELAN_CPUFREQ)	+= elanfreq.o
 obj-$(CONFIG_X86_LONGRUN)	+= longrun.o  
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/cpu/cpufreq/elanfreq.c

@@ -296,7 +296,6 @@ static int __init elanfreq_init(void)
 		max_freq = elanfreq_get_cpu_frequency();
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = 1000;
 	driver->cpu_cur_freq[0] = elanfreq_get_cpu_frequency();
 #endif
 
@@ -307,7 +306,9 @@ static int __init elanfreq_init(void)
 	driver->policy[0].min    = 1000;
 	driver->policy[0].max    = max_freq;
 	driver->policy[0].policy = CPUFREQ_POLICY_PERFORMANCE;
-	driver->policy[0].max_cpu_freq  = max_freq;
+	driver->policy[0].cpuinfo.max_freq = max_freq;
+	driver->policy[0].cpuinfo.min_freq = min_freq;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	elanfreq_driver = driver;
 

arch/i386/kernel/cpu/cpufreq/longhaul.c

@@ -779,7 +779,6 @@ static int __init longhaul_init (void)
 	driver->policy = (struct cpufreq_policy *) (driver + 1);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = (unsigned int) lowest_speed;
 	driver->cpu_cur_freq[0] = currentspeed;
 #endif
 
@@ -790,7 +789,9 @@ static int __init longhaul_init (void)
 	driver->policy[0].min = (unsigned int) lowest_speed;
 	driver->policy[0].max = (unsigned int) highest_speed;
 	driver->policy[0].policy = CPUFREQ_POLICY_PERFORMANCE;
-	driver->policy[0].max_cpu_freq = (unsigned int) highest_speed;
+	driver->policy[0].cpuinfo.min_freq = (unsigned int) lowest_speed;
+	driver->policy[0].cpuinfo.max_freq = (unsigned int) highest_speed;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	longhaul_driver = driver;
 

arch/i386/kernel/cpu/cpufreq/longrun.c

@@ -121,8 +121,9 @@ static int longrun_verify_policy(struct cpufreq_policy *policy)
 		return -EINVAL;
 
 	policy->cpu = 0;
-	cpufreq_verify_within_limits(policy, 0, 
-		longrun_driver->policy[0].max_cpu_freq);
+	cpufreq_verify_within_limits(policy, 
+		longrun_driver->policy[0].cpuinfo.min_freq, 
+		longrun_driver->policy[0].cpuinfo.max_freq);
 
 	return 0;
 }
@@ -247,12 +248,13 @@ static int __init longrun_init(void)
 		kfree(driver);
 		return -EIO;
 	}
-	driver->policy[0].max_cpu_freq  = longrun_high_freq;
+	driver->policy[0].cpuinfo.min_freq = longrun_low_freq;
+	driver->policy[0].cpuinfo.max_freq = longrun_high_freq;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	longrun_get_policy(&driver->policy[0]);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = longrun_low_freq;
 	driver->cpu_cur_freq[0] = longrun_high_freq; /* dummy value */
 #endif
 

arch/i386/kernel/cpu/cpufreq/p4-clockmod.c

@@ -257,7 +257,6 @@ int __init cpufreq_p4_init(void)
 
 #ifdef CONFIG_CPU_FREQ_24_API
 	for (i=0;i<NR_CPUS;i++) {
-		driver->cpu_min_freq[i] = stock_freq / 8;
 		driver->cpu_cur_freq[i] = stock_freq;
 	}
 #endif
@@ -272,7 +271,10 @@ int __init cpufreq_p4_init(void)
 			driver->policy[i].min    = stock_freq / 8;
 		driver->policy[i].max    = stock_freq;
 		driver->policy[i].policy = CPUFREQ_POLICY_PERFORMANCE;
-		driver->policy[i].max_cpu_freq  = stock_freq;
+		driver->policy[i].cpuinfo.min_freq  = driver->policy[i].min;
+		driver->policy[i].cpuinfo.max_freq  = stock_freq;
+		driver->policy[i].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+
 		driver->policy[i].cpu    = i;
 	}
 

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

@@ -242,7 +242,6 @@ static int __init powernow_k6_init(void)
 	driver->policy = (struct cpufreq_policy *) (driver + 1);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0]  = busfreq * 20;
 	driver->cpu_cur_freq[0]  = busfreq * max_multiplier;
 #endif
 
@@ -253,7 +252,9 @@ static int __init powernow_k6_init(void)
 	driver->policy[0].min    = busfreq * 20;
 	driver->policy[0].max    = busfreq * max_multiplier;
 	driver->policy[0].policy = CPUFREQ_POLICY_PERFORMANCE;
-	driver->policy[0].max_cpu_freq  = busfreq * max_multiplier;
+	driver->policy[0].cpuinfo.max_freq = busfreq * max_multiplier;
+	driver->policy[0].cpuinfo.min_freq = busfreq * 20;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
 
 	powernow_driver = driver;
 

arch/i386/kernel/cpu/cpufreq/speedstep.c

@@ -693,7 +693,6 @@ static int __init speedstep_init(void)
 	driver->policy = (struct cpufreq_policy *) (driver + 1);
 
 #ifdef CONFIG_CPU_FREQ_24_API
-	driver->cpu_min_freq[0] = speedstep_low_freq;
 	driver->cpu_cur_freq[0] = speed;
 #endif
 
@@ -703,7 +702,10 @@ static int __init speedstep_init(void)
 	driver->policy[0].cpu    = 0;
 	driver->policy[0].min    = speedstep_low_freq;
 	driver->policy[0].max    = speedstep_high_freq;
-	driver->policy[0].max_cpu_freq = speedstep_high_freq;
+	driver->policy[0].cpuinfo.min_freq = speedstep_low_freq;
+	driver->policy[0].cpuinfo.max_freq = speedstep_high_freq;
+	driver->policy[0].cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+
 	driver->policy[0].policy = (speed == speedstep_low_freq) ? 
 	    CPUFREQ_POLICY_POWERSAVE : CPUFREQ_POLICY_PERFORMANCE;
 

arch/i386/kernel/cpu/mcheck/Makefile

 obj-y	=	mce.o k7.o p4.o p5.o p6.o winchip.o
 obj-$(CONFIG_X86_MCE_NONFATAL)	+=	non-fatal.o
-
-include $(TOPDIR)/Rules.make
-

arch/i386/kernel/cpu/mtrr/Makefile

@@ -4,5 +4,3 @@ obj-y		+= cyrix.o
 obj-y		+= centaur.o
 
 export-objs	:= main.o
-
-include $(TOPDIR)/Rules.make

arch/i386/kernel/suspend_asm.S

@@ -6,7 +6,7 @@
 #include <asm/segment.h>
 #include <asm/page.h>
 
-ENTRY(do_magic):
+ENTRY(do_magic)
 	pushl %ebx
 	cmpl $0,8(%esp)
 	jne .L1450
@@ -66,7 +66,7 @@ ENTRY(do_magic):
 .L1453:
 	movl $104,%eax
 
-	movw %eax, %ds
+	movw %ax, %ds
 	movl saved_context_esp, %esp
 	movl saved_context_ebp, %ebp
 	movl saved_context_eax, %eax

arch/i386/kernel/sys_i386.c

@@ -140,7 +140,11 @@ asmlinkage int sys_ipc (uint call, int first, int second,
 
 	switch (call) {
 	case SEMOP:
-		return sys_semop (first, (struct sembuf *)ptr, second);
+		return sys_semtimedop (first, (struct sembuf *)ptr, second, NULL);
+	case SEMTIMEDOP:
+		return sys_semtimedop(first, (struct sembuf *)ptr, second,
+					(const struct timespec *)fifth);
+
 	case SEMGET:
 		return sys_semget (first, second, third);
 	case SEMCTL: {

arch/i386/kernel/timers/Makefile

@@ -7,5 +7,3 @@ obj-y := timer.o
 obj-y += timer_tsc.o
 obj-y += timer_pit.o
 obj-$(CONFIG_X86_CYCLONE)   += timer_cyclone.o
-
-include $(TOPDIR)/Rules.make

arch/i386/lib/Makefile

@@ -11,5 +11,3 @@ obj-y = checksum.o delay.o \
 obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
 obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
 obj-$(CONFIG_DEBUG_IOVIRT)  += iodebug.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mach-generic/Makefile

@@ -5,5 +5,3 @@
 EXTRA_CFLAGS	+= -I../kernel
 
 obj-y				:= setup.o topology.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mach-visws/Makefile

@@ -9,5 +9,3 @@ obj-y				:= setup.o traps.o
 obj-$(CONFIG_PCI)		+= pci-visws.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mach-voyager/Makefile

@@ -13,5 +13,3 @@ export-objs	:=
 obj-y			:= setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o
-
-include $(TOPDIR)/Rules.make

arch/i386/math-emu/Makefile

@@ -26,7 +26,5 @@ A_OBJS =reg_u_add.o reg_u_div.o reg_u_mul.o reg_u_sub.o \
 
 obj-y =$(C_OBJS) $(A_OBJS)
 
-include $(TOPDIR)/Rules.make
-
 proto:
 	cproto -e -DMAKING_PROTO *.c >fpu_proto.h

arch/i386/mm/Makefile

@@ -9,5 +9,3 @@ obj-y	:= init.o pgtable.o fault.o ioremap.o extable.o pageattr.o
 obj-$(CONFIG_DISCONTIGMEM)	+= discontig.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_HIGHMEM) += highmem.o
-
-include $(TOPDIR)/Rules.make

arch/i386/mm/fault.c

@@ -28,8 +28,6 @@
 
 extern void die(const char *,struct pt_regs *,long);
 
-extern int console_loglevel;
-
 #ifndef CONFIG_X86_WP_WORKS_OK
 /*
  * Ugly, ugly, but the goto's result in better assembly..

arch/i386/mm/hugetlbpage.c

@@ -20,6 +20,8 @@
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>
 
+#include <linux/sysctl.h>
+
 static long    htlbpagemem;
 int     htlbpage_max;
 static long    htlbzone_pages;
@@ -555,6 +557,53 @@ int alloc_hugetlb_pages(int key, unsigned long addr, unsigned long len, int prot
 		return alloc_shared_hugetlb_pages(key, addr, len, prot, flag);
 	return alloc_private_hugetlb_pages(key, addr, len, prot, flag);
 }
+void update_and_free_page(struct page *page)
+{
+	int j;
+	struct page *map;
+
+	map = page;
+	htlbzone_pages--;
+	for (j = 0; j < (HPAGE_SIZE / PAGE_SIZE); j++) {
+		map->flags &= ~(1 << PG_locked | 1 << PG_error | 1 << PG_referenced |
+				1 << PG_dirty | 1 << PG_active | 1 << PG_reserved |
+				1 << PG_private | 1<< PG_writeback);
+		set_page_count(map, 0);
+		map++;
+	}
+	set_page_count(page, 1);
+	__free_pages(page, HUGETLB_PAGE_ORDER);
+}
+
+int try_to_free_low(int count)
+{
+	struct list_head *p;
+	struct page *page, *map;
+
+	map = NULL;
+	spin_lock(&htlbpage_lock);
+	list_for_each(p, &htlbpage_freelist) {
+		if (map) {
+			list_del(&map->list);
+			update_and_free_page(map);
+			htlbpagemem--;
+			map = NULL;
+			if (++count == 0)
+				break;
+		}
+		page = list_entry(p, struct page, list);
+		if ((page_zone(page))->name[0] != 'H') // Look for non-Highmem
+				map = page;
+	}
+	if (map) {
+		list_del(&map->list);
+		update_and_free_page(map);
+		htlbpagemem--;
+		count++;
+	}
+	spin_unlock(&htlbpage_lock);
+	return count;
+}
 
 int set_hugetlb_mem_size(int count)
 {
@@ -568,6 +617,8 @@ int set_hugetlb_mem_size(int count)
 	else
 		lcount = count - htlbzone_pages;
 
+	if (lcount == 0)
+		return (int)htlbzone_pages;
 	if (lcount > 0) {	/* Increase the mem size. */
 		while (lcount--) {
 			page = alloc_pages(__GFP_HIGHMEM, HUGETLB_PAGE_ORDER);
@@ -587,23 +638,14 @@ int set_hugetlb_mem_size(int count)
 		return (int) htlbzone_pages;
 	}
 	/* Shrink the memory size. */
+	lcount = try_to_free_low(lcount);
 	while (lcount++) {
 		page = alloc_hugetlb_page();
 		if (page == NULL)
 			break;
 		spin_lock(&htlbpage_lock);
-		htlbzone_pages--;
+		update_and_free_page(page);
 		spin_unlock(&htlbpage_lock);
-		map = page;
-		for (j = 0; j < (HPAGE_SIZE / PAGE_SIZE); j++) {
-			map->flags &= ~(1 << PG_locked | 1 << PG_error | 1 << PG_referenced |
-					1 << PG_dirty | 1 << PG_active | 1 << PG_reserved |
-					1 << PG_private | 1<< PG_writeback);
-			set_page_count(map, 0);
-			map++;
-		}
-		set_page_count(page, 1);
-		__free_pages(page, HUGETLB_PAGE_ORDER);
 	}
 	return (int) htlbzone_pages;
 }
@@ -659,6 +701,13 @@ int hugetlb_report_meminfo(char *buf)
 			HPAGE_SIZE/1024);
 }
 
+int is_hugepage_mem_enough(size_t size)
+{
+	if (size > (htlbpagemem << HPAGE_SHIFT))
+		return 0;
+	return 1;
+}
+
 static struct page * hugetlb_nopage(struct vm_area_struct * area, unsigned long address, int unused)
 {
 	BUG();

arch/i386/mm/init.c

@@ -134,8 +134,10 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
 	pgd = pgd_base + pgd_ofs;
 	pfn = 0;
 
-	for (; pgd_ofs < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_ofs++) {
+	for (; pgd_ofs < PTRS_PER_PGD; pgd++, pgd_ofs++) {
 		pmd = one_md_table_init(pgd);
+		if (pfn >= max_low_pfn)
+			continue;
 		for (pmd_ofs = 0; pmd_ofs < PTRS_PER_PMD && pfn < max_low_pfn; pmd++, pmd_ofs++) {
 			/* Map with big pages if possible, otherwise create normal page tables. */
 			if (cpu_has_pse) {

arch/i386/pci/Makefile

@@ -16,5 +16,3 @@ obj-y		+= legacy.o
 
 endif		# CONFIG_X86_NUMAQ
 obj-y		+= irq.o common.o
-
-include $(TOPDIR)/Rules.make

arch/i386/vmlinux.lds.S

@@ -67,6 +67,9 @@ SECTIONS
   __setup_start = .;
   .init.setup : { *(.init.setup) }
   __setup_end = .;
+  __start___param = .;
+  __param : { *(__param) }
+  __stop___param = .;
   __initcall_start = .;
   .initcall.init : {
 	*(.initcall1.init) 

arch/ia64/dig/Makefile

@@ -7,5 +7,3 @@
 
 obj-y := setup.o
 obj-$(CONFIG_IA64_GENERIC) += machvec.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/common/Makefile

@@ -8,5 +8,3 @@
 export-objs := sba_iommu.o
 
 obj-y := sba_iommu.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/sim/Makefile

@@ -13,5 +13,3 @@ obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
 obj-$(CONFIG_HP_SIMETH)	+= simeth.o
 obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
 obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/hp/zx1/Makefile

@@ -7,5 +7,3 @@
 
 obj-y := hpzx1_misc.o
 obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/ia32/Makefile

@@ -4,5 +4,3 @@
 
 obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o ia32_support.o ia32_traps.o \
 	 binfmt_elf32.o ia32_ldt.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/ia32/sys_ia32.c

@@ -2124,6 +2124,7 @@ struct ipc_kludge {
 #define SEMOP		 1
 #define SEMGET		 2
 #define SEMCTL		 3
+#define SEMTIMEDOP	 4
 #define MSGSND		11
 #define MSGRCV		12
 #define MSGGET		13

arch/ia64/kernel/Makefile

@@ -15,5 +15,3 @@ obj-$(CONFIG_EFI_VARS) += efivars.o
 obj-$(CONFIG_SMP) += smp.o smpboot.o
 obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
 obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/kernel/entry.S

@@ -1254,7 +1254,7 @@ sys_call_table:
 	data8 sys_epoll_create
 	data8 sys_epoll_ctl
 	data8 sys_epoll_wait			// 1245
-	data8 ia64_ni_syscall
+	data8 sys_semtimedop
 	data8 ia64_ni_syscall
 	data8 ia64_ni_syscall
 	data8 ia64_ni_syscall

arch/ia64/kernel/perfmon.c

@@ -783,7 +783,6 @@ pfm_smpl_buffer_alloc(pfm_context_t *ctx, unsigned long *which_pmds, unsigned lo
 	vma->vm_ops	     = &pfm_vm_ops; /* necesarry to get the close() callback */
 	vma->vm_pgoff	     = 0;
 	vma->vm_file	     = NULL;
-	vma->vm_raend	     = 0;
 	vma->vm_private_data = psb;	/* information needed by the pfm_vm_close() function */
 
 	/*

arch/ia64/lib/Makefile

@@ -20,8 +20,6 @@ obj-$(CONFIG_PERFMON)	+= carta_random.o
 IGNORE_FLAGS_OBJS =	__divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
 			__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o
 
-include $(TOPDIR)/Rules.make
-
 AFLAGS___divdi3.o	=
 AFLAGS___udivdi3.o	= -DUNSIGNED
 AFLAGS___moddi3.o	= 	     -DMODULO

arch/ia64/mm/Makefile

@@ -11,5 +11,3 @@ obj-y	 := init.o fault.o tlb.o extable.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA) += numa.o
 obj-$(CONFIG_DISCONTIGMEM) += discontig.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/pci/Makefile

 obj-y		:= pci.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/fakeprom/Makefile

@@ -18,7 +18,3 @@ fprom: $(OBJ)
 
 clean:
 	rm -f *.o fprom
-
-
-include $(TOPDIR)/Rules.make
-

arch/ia64/sn/io/Makefile

@@ -37,5 +37,3 @@ obj-$(CONFIG_IA64_SGI_SN2)   += sn2/ml_SN_intr.o sn2/shub_intr.o sn2/shuberror.o
 				sn2/pcibr/pcibr_rrb.o sn2/pcibr/pcibr_slot.o 
 
 obj-$(CONFIG_PCIBA) += pciba.o
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/Makefile

@@ -41,6 +41,3 @@ obj-$(CONFIG_IA64_SGI_SN2)      += irq.o mca.o sn2/
 obj-$(CONFIG_IA64_SGI_AUTOTEST) += llsc4.o misctest.o
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
 obj-$(CONFIG_MODULES)           += sn_ksyms.o
-
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/sn1/Makefile

@@ -35,5 +35,3 @@
 obj-y := cache.o error.o iomv.o synergy.o sn1_smp.o
 
 EXTRA_CFLAGS := -DLITTLE_ENDIAN
-
-include $(TOPDIR)/Rules.make

arch/ia64/sn/kernel/sn2/Makefile

@@ -35,6 +35,3 @@
 obj-y := cache.o iomv.o sn2_smp.o
 
 EXTRA_CFLAGS    := -DLITTLE_ENDIAN
-
-include $(TOPDIR)/Rules.make
-

arch/ia64/vmlinux.lds.S

@@ -102,6 +102,10 @@ SECTIONS
   .init.setup : AT(ADDR(.init.setup) - PAGE_OFFSET)
         { *(.init.setup) }
   __setup_end = .;
+  __start___param = .;
+  __param : AT(ADDR(__param) - PAGE_OFFSET)
+        { *(__param) }
+  __stop___param = .;
   __initcall_start = .;
   .initcall.init : AT(ADDR(.initcall.init) - PAGE_OFFSET)
 	{

arch/m68k/amiga/Makefile

@@ -7,5 +7,3 @@ export-objs	:= amiga_ksyms.o
 obj-y		:= config.o amiints.o cia.o chipram.o amisound.o amiga_ksyms.o
 
 obj-$(CONFIG_AMIGA_PCMCIA)	+= pcmcia.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/apollo/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= config.o dn_ints.o dma.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/atari/Makefile

@@ -10,5 +10,3 @@ obj-y		:= config.o time.o debug.o ataints.o stdma.o \
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_HADES)	+= hades-pci.o
 endif
-
-include $(TOPDIR)/Rules.make

arch/m68k/bvme6000/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= config.o bvmeints.o rtc.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/fpsp040/Makefile

@@ -13,6 +13,4 @@ obj-y    := bindec.o binstr.o decbin.o do_func.o gen_except.o get_op.o \
 EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
 
-include $(TOPDIR)/Rules.make
-
 $(OS_OBJS): fpsp.h

arch/m68k/hp300/Makefile

@@ -3,5 +3,3 @@
 #
 
 obj-y		:= ksyms.o config.o ints.o time.o reboot.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/ifpsp060/Makefile

@@ -8,5 +8,3 @@ obj-y := fskeleton.o iskeleton.o os.o
 
 EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
-
-include $(TOPDIR)/Rules.make

arch/m68k/kernel/Makefile

@@ -17,8 +17,6 @@ obj-$(CONFIG_PCI)	+= bios32.o
 
 EXTRA_AFLAGS := -traditional
 
-include $(TOPDIR)/Rules.make
-
 $(obj)/head.o: $(obj)/head.S $(obj)/m68k_defs.h
 
 $(obj)/entry.o: $(obj)/entry.S $(obj)/m68k_defs.h

arch/m68k/lib/Makefile

@@ -8,5 +8,3 @@ EXTRA_AFLAGS := -traditional
 
 obj-y		:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
 			checksum.o memcmp.o memcpy.o memset.o semaphore.o
-
-include $(TOPDIR)/Rules.make

arch/m68k/mac/Makefile

@@ -6,5 +6,3 @@ export-objs	:= mac_ksyms.o
 
 obj-y		:= config.o bootparse.o macints.o iop.o via.o oss.o psc.o \
 			baboon.o macboing.o debug.o misc.o mac_ksyms.o
-
-include $(TOPDIR)/Rules.make