# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.930.107.9+1.930.156.1 -> 1.930.107.10
# mm/mmap.c 1.25.1.5 -> 1.29.1.5
# include/linux/sched.h 1.33.1.5 -> 1.37.1.2
# Makefile 1.190.1.24 -> 1.193.1.17
# drivers/ide/ide-dma.c 1.6.1.5 -> 1.10.1.1
# include/linux/pci_ids.h 1.44.1.19 -> 1.46.1.13
# Documentation/Configure.help 1.128.25.3 -> 1.128.13.15
#
diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help
--- a/Documentation/Configure.help Wed Oct 8 09:08:57 2003
+++ b/Documentation/Configure.help Wed Oct 8 09:08:57 2003
@@ -18572,70 +18572,64 @@
will issue the hlt instruction if nothing is to be done, thereby
sending the processor to sleep and saving power.
-ACPI support
-CONFIG_ACPI
- ACPI/OSPM support for Linux is currently under development. As such,
- this support is preliminary and EXPERIMENTAL. Configuring ACPI
- support enables kernel interfaces that allow higher level software
- (OSPM) to manipulate ACPI defined hardware and software interfaces,
- including the evaluation of ACPI control methods. If unsure, choose
- N here. Note, this option will enlarge your kernel by about 120K.
-
- This support requires an ACPI compliant platform (hardware/firmware).
- If both ACPI and Advanced Power Management (APM) support are
- configured, whichever is loaded first shall be used.
-
- This code DOES NOT currently provide a complete OSPM implementation
- -- it has not yet reached APM's level of functionality. When fully
- implemented, Linux ACPI/OSPM will provide a more robust functional
- replacement for legacy configuration and power management
- interfaces, including the Plug-and-Play BIOS specification (PnP
- BIOS), the Multi-Processor Specification (MPS), and the Advanced
- Power Management specification (APM).
-
- Linux support for ACPI/OSPM is based on Intel Corporation's ACPI
- Component Architecture (ACPI CA). The latest ACPI CA source code,
- documentation, debug builds, and implementation status information
- can be downloaded from:
- <http://developer.intel.com/technology/iapc/acpi/downloads.htm>.
-
- The ACPI Sourceforge project may also be of interest:
- <http://sf.net/projects/acpi/>
-
-Enable ACPI 2.0 with errata 1.3
-CONFIG_ACPI20
- Enable support for the 2.0 version of the ACPI interpreter. See the
- help for ACPI for caveats and discussion.
-
-ACPI kernel configuration manager
-CONFIG_ACPI_KERNEL_CONFIG
- If you say `Y' here, Linux's ACPI support will use the
- hardware-level system descriptions found on IA64 machines.
-
-ACPI Debug Statements
-CONFIG_ACPI_DEBUG
- The ACPI driver can optionally report errors with a great deal
- of verbosity. Saying Y enables these statements. This will increase
- your kernel size by around 50K.
+ACPI Support
+CONFIG_ACPI_ENABLE
+ Advanced Configuration and Power Interface (ACPI) support for
+ Linux requires an ACPI compliant platform (hardware/firmware),
+ and assumes the presence of OS-directed configuration and power
+ management (OSPM) software. This option will enlarge your
+ kernel by about 70K.
+
+ Linux ACPI provides a robust functional replacement for several
+ legacy configuration and power management intefaces, including
+ the Plug-and-Play BIOS specification (PnP BIOS), the
+ MultiProcessor Specification (MPS), and the Advanced Power
+ Management (APM) specification. If both ACPI and APM support
+ are configured, whichever is loaded first shall be used.
+
+ Add "acpi=off" to the kernel command line to disable this feature.
+ (Try "man bootparam" or see the documentation of your boot loader
+ about how to pass options to the kernel at boot time.)
+
+ Add "acpi=ht-only" to the kernel command line to limit ACPI
+ support to processor enumeration only (see CONFIG_ACPI_HT_ONLY).
+
+ ----------
+
+ The ACPI SourceForge project contains the latest source code,
+ documentation, tools, mailing list subscription, and other
+ information. This project is available at:
+ <http://sourceforge.net/projects/acpi>
+
+ Linux support for ACPI is based on Intel Corporation's ACPI
+ Component Architecture (ACPI CA). For more information see:
+ <http://developer.intel.com/technology/iapc/acpi>
+
+ ACPI is an open industry specification co-developed by Compaq,
+ Intel, Microsoft, Phoenix, and Toshiba. The specification is
+ available at:
+ <http://www.acpi.info>
+
+CONFIG_ACPI_HT_ONLY
+ This option enables limited ACPI support -- just enough to
+ enumerate processors from the ACPI Multiple APIC Description
+ Table (MADT). Note that ACPI supports both logical (e.g. Hyper-
+ Threading) and physical processors, where the MultiProcessor
+ Specification (MPS) table only supports physical processors.
-ACPI Bus Manager
-CONFIG_ACPI_BUSMGR
- The ACPI Bus Manager enumerates devices in the ACPI namespace, and
- handles PnP messages. All ACPI devices use its services, so using
- them requires saying Y here.
+ Full ACPI support (CONFIG_ACPI) is preferred. Use this option
+ only if you wish to limit ACPI's role to processor enumeration.
-ACPI System Driver
-CONFIG_ACPI_SYS
- This driver will enable your system to shut down using ACPI, and
- dump your ACPI DSDT table using /proc/acpi/dsdt.
+CONFIG_ACPI_AC
+ This driver adds support for the AC Adapter object, which indicates
+ whether a system is on AC, or not. Typically, only mobile systems
+ have this object, since desktops are always on AC.
-ACPI Processor Driver
-CONFIG_ACPI_CPU
- This driver installs ACPI as the idle handler for Linux, and uses
- ACPI C2 and C3 processor states to save power, on systems that
- support it.
+CONFIG_ACPI_BATTERY
+ This driver adds support for battery information through
+ /proc/acpi/battery. If you have a mobile system with a battery,
+ say Y.
-ACPI Button
CONFIG_ACPI_BUTTON
This driver registers for events based on buttons, such as the
power, sleep, and lid switch. In the future, a daemon will read
@@ -18643,27 +18637,34 @@
down the system. Until then, you can cat it, and see output when
a button is pressed.
-ACPI AC Adapter
-CONFIG_ACPI_AC
- This driver adds support for the AC Adapter object, which indicates
- whether a system is on AC, or not. Typically, only laptops have
- this object, since desktops are always on AC.
-
-ACPI Embedded Controller
CONFIG_ACPI_EC
This driver is required on some systems for the proper operation of
- the battery and thermal drivers. If you are compiling for a laptop,
- say Y.
+ the battery and thermal drivers. If you are compiling for a
+ mobile system, say Y.
-ACPI Control Method Battery
-CONFIG_ACPI_CMBATT
- This driver adds support for battery information through
- /proc/acpi/battery. If you have a laptop with a battery, say Y.
+CONFIG_ACPI_PROCESSOR
+ This driver installs ACPI as the idle handler for Linux, and uses
+ ACPI C2 and C3 processor states to save power, on systems that
+ support it.
-ACPI Thermal
CONFIG_ACPI_THERMAL
- This driver handles overheating conditions on laptops. It is HIGHLY
- recommended, as your laptop CPU may be damaged without it.
+ This driver adds support for ACPI thermal zones. Most mobile and
+ some desktop systems support ACPI thermal zones. It is HIGHLY
+ recommended that this option be enabled, as your processor(s)
+ may be damaged without it.
+
+CONFIG_ACPI_FAN
+ This driver adds support for ACPI fan devices, allowing user-mode
+ applications to perform basic fan control (on, off, status).
+
+CONFIG_ACPI_SYSTEM
+ This driver will enable your system to shut down using ACPI, and
+ dump your ACPI DSDT table using /proc/acpi/dsdt.
+
+CONFIG_ACPI_DEBUG
+ The ACPI driver can optionally report errors with a great deal
+ of verbosity. Saying Y enables these statements. This will increase
+ your kernel size by around 50K.
Advanced Power Management BIOS support
CONFIG_APM
@@ -25740,11 +25741,13 @@
# Choice: ia64type
Itanium
CONFIG_ITANIUM
- Select your IA64 processor type. The default is Intel Itanium.
+ Select your IA-64 processor type. The default is Intel Itanium.
+ This choice is safe for all IA-64 systems, but may not perform
+ optimally on systems with, say, Itanium 2 or newer processors.
-McKinley
+Itanium 2
CONFIG_MCKINLEY
- Select this to configure for a McKinley processor.
+ Select this to configure for an Itanium 2 (McKinley) processor.
# Choice: ia64system
IA-64 system type
@@ -25821,12 +25824,31 @@
and restore instructions. It's useful for tracking down spinlock
problems, but slow! If you're unsure, select N.
-Early printk support (requires VGA!)
+Early printk support
CONFIG_IA64_EARLY_PRINTK
- Selecting this option uses the VGA screen for printk() output before
- the consoles are initialised. It is useful for debugging problems
- early in the boot process, but only if you have a VGA screen
- attached. If you're unsure, select N.
+ Selecting this option uses a UART or VGA screen (or both) for
+ printk() output before the consoles are initialised. It is useful
+ for debugging problems early in the boot process, but only if you
+ have a serial terminal or a VGA screen attached. If you're unsure,
+ select N.
+
+Early printk on serial port
+CONFIG_IA64_EARLY_PRINTK_UART
+ Select this option to use a serial port for early printk() output.
+ You must also select either CONFIG_IA64_EARLY_PRINTK_UART_BASE or
+ CONFIG_SERIAL_HCDP. If you select CONFIG_SERIAL_HCDP, early
+ printk() output will appear on the first console device described by
+ the HCDP. If you set CONFIG_IA64_EARLY_PRINTK_UART_BASE, the HCDP
+ will be ignored.
+
+UART base address
+CONFIG_IA64_EARLY_PRINTK_UART_BASE
+ The physical MMIO address of the UART to use for early printk().
+ This overrides any UART located using the EFI HCDP table.
+
+Early printk on VGA
+CONFIG_IA64_EARLY_PRINTK_VGA
+ Select this option to use VGA for early printk() output.
Print possible IA64 hazards to console
CONFIG_IA64_PRINT_HAZARDS
diff -Nru a/Makefile b/Makefile
--- a/Makefile Wed Oct 8 09:08:57 2003
+++ b/Makefile Wed Oct 8 09:08:57 2003
@@ -90,6 +90,7 @@
CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-fno-strict-aliasing -fno-common
+CFLAGS += -g
ifndef CONFIG_FRAME_POINTER
CFLAGS += -fomit-frame-pointer
endif
@@ -300,8 +301,7 @@
$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
xconfig: symlinks
- $(MAKE) -C scripts kconfig.tk
- wish -f scripts/kconfig.tk
+ @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***"
menuconfig: include/linux/version.h symlinks
$(MAKE) -C scripts/lxdialog all
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h Wed Oct 8 09:08:57 2003
+++ b/include/linux/pci_ids.h Wed Oct 8 09:08:57 2003
@@ -544,6 +544,7 @@
#define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229
#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a
#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e
+#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
#define PCI_VENDOR_ID_PCTECH 0x1042
#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000
diff -Nru a/mm/mmap.c b/mm/mmap.c
--- a/mm/mmap.c Wed Oct 8 09:08:57 2003
+++ b/mm/mmap.c Wed Oct 8 09:08:57 2003
@@ -14,6 +14,7 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/personality.h>
+#include <linux/hugetlb.h>
#include <asm/uaccess.h>
#include <asm/pgalloc.h>
@@ -594,7 +595,10 @@
fput(file);
/* Undo any partial mapping done by a device driver. */
- zap_page_range(mm, vma->vm_start, vma->vm_end - vma->vm_start);
+ if (is_vm_hugetlb_page(vma))
+ zap_hugepage_range(vma, vma->vm_start, vma->vm_end-vma->vm_start);
+ else
+ zap_page_range(mm, vma->vm_start, vma->vm_end - vma->vm_start);
free_vma:
kmem_cache_free(vm_area_cachep, vma);
return error;
@@ -644,10 +648,26 @@
unsigned long get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
{
if (flags & MAP_FIXED) {
+ unsigned long ret;
+
if (addr > TASK_SIZE - len)
return -ENOMEM;
if (addr & ~PAGE_MASK)
return -EINVAL;
+ if (file && is_file_hugepages(file))
+ /* If the request is for hugepages, then make sure
+ * that addr and length is properly aligned.
+ */
+ ret = is_aligned_hugepage_range(addr, len);
+ else
+ /*
+ * Make sure that a normal request is not falling
+ * in reserved hugepage range. For some archs like
+ * IA-64, there is a separate region for hugepages.
+ */
+ ret = is_invalid_hugepage_range(addr, len);
+ if (ret)
+ return ret;
return addr;
}
@@ -941,6 +961,12 @@
return 0;
/* we have addr < mpnt->vm_end */
+ if (is_vm_hugetlb_page(mpnt)) {
+ int ret = is_aligned_hugepage_range(addr, len);
+ if (ret)
+ return ret;
+ }
+
if (mpnt->vm_start >= addr+len)
return 0;
@@ -994,7 +1020,10 @@
remove_shared_vm_struct(mpnt);
mm->map_count--;
- zap_page_range(mm, st, size);
+ if (is_vm_hugetlb_page(mpnt))
+ zap_hugepage_range(mpnt, st, size);
+ else
+ zap_page_range(mm, st, size);
/*
* Fix the mapping, and free the old area if it wasn't reused.
@@ -1151,7 +1180,10 @@
}
mm->map_count--;
remove_shared_vm_struct(mpnt);
- zap_page_range(mm, start, size);
+ if (is_vm_hugetlb_page(mpnt))
+ zap_hugepage_range(mpnt, start, size);
+ else
+ zap_page_range(mm, start, size);
if (mpnt->vm_file)
fput(mpnt->vm_file);
kmem_cache_free(vm_area_cachep, mpnt);