# 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.1069.175.4+1.1069.176.89 -> 1.1069.175.5
# drivers/scsi/megaraid.c 1.19.1.7 -> 1.23.1.3
# arch/m68k/bvme6000/rtc.c 1.7.1.1 -> 1.10
# drivers/char/agp/agpgart_be.c 1.35.1.18 -> 1.41.1.25
# drivers/char/mips_rtc.c 1.2.1.1 -> 1.5
# drivers/sbus/char/rtc.c 1.9.1.1 -> 1.12
# drivers/char/ds1286.c 1.10.1.1 -> 1.13
# kernel/signal.c 1.7.1.3 -> 1.9.1.1
# drivers/char/rtc.c 1.15.1.1 -> 1.18
# drivers/char/agp/agp.h 1.18.1.8 -> 1.27
# drivers/net/tg3.c 1.61.2.50 -> 1.62.1.11
# drivers/char/ip27-rtc.c 1.7.1.1 -> 1.10
# arch/cris/drivers/pcf8563.c 1.4.1.1 -> 1.7
# drivers/hil/hp_sdc_rtc.c 1.3.1.1 -> 1.6
# mm/mmap.c 1.25.1.8 -> 1.29.1.8
# Makefile 1.190.1.71 -> 1.193.1.43
# net/irda/irnet/irnet.h 1.12.1.1 -> 1.15
# drivers/char/efirtc.c 1.7.1.1 -> 1.11
# net/ipv4/netfilter/ip_fw_compat_masq.c 1.5.1.1 -> 1.8
# arch/cris/drivers/ds1302.c 1.7.1.1 -> 1.10
# Documentation/Configure.help 1.162.1.57 -> 1.166.1.26
# drivers/macintosh/rtc.c 1.7.1.1 -> 1.10
# fs/inode.c 1.36.1.10 -> 1.40.1.5
# drivers/acorn/char/i2c.c 1.4.1.1 -> 1.7
# arch/ppc64/kernel/rtc.c 1.6 -> 1.7
# arch/m68k/mvme16x/rtc.c 1.5.1.1 -> 1.8
#
diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help
--- a/Documentation/Configure.help Thu Jan 8 16:33:51 2004
+++ b/Documentation/Configure.help Thu Jan 8 16:33:51 2004
@@ -18502,6 +18502,11 @@
purpose port, say Y here. See
<http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf>.
+Support for serial ports defined in ACPI namespace
+CONFIG_SERIAL_ACPI
+ If you wish to enable serial port discovery via the ACPI
+ namespace, say Y here. If unsure, say N.
+
Support for PowerMac serial ports
CONFIG_MAC_SERIAL
If you have Macintosh style serial ports (8 pin mini-DIN), say Y
diff -Nru a/Makefile b/Makefile
--- a/Makefile Thu Jan 8 16:33:51 2004
+++ b/Makefile Thu Jan 8 16:33:51 2004
@@ -93,6 +93,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
@@ -306,8 +307,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/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
--- a/drivers/char/agp/agpgart_be.c Thu Jan 8 16:33:50 2004
+++ b/drivers/char/agp/agpgart_be.c Thu Jan 8 16:33:50 2004
@@ -45,6 +45,7 @@
#include <linux/pagemap.h>
#include <linux/miscdevice.h>
#include <linux/pm.h>
+#include <linux/acpi.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -217,10 +218,14 @@
agp_bridge.free_by_type(curr);
return;
}
- if (curr->page_count != 0) {
- for (i = 0; i < curr->page_count; i++) {
- agp_bridge.agp_destroy_page((unsigned long)
- phys_to_virt(curr->memory[i]));
+ if (agp_bridge.cant_use_aperture) {
+ vfree(curr->vmptr);
+ } else {
+ if (curr->page_count != 0) {
+ for (i = 0; i < curr->page_count; i++) {
+ agp_bridge.agp_destroy_page((unsigned long)
+ phys_to_virt(curr->memory[i]));
+ }
}
}
agp_free_key(curr->key);
@@ -229,6 +234,8 @@
MOD_DEC_USE_COUNT;
}
+#define IN_VMALLOC(_x) (((_x) >= VMALLOC_START) && ((_x) < VMALLOC_END))
+
#define ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(unsigned long))
agp_memory *agp_allocate_memory(size_t page_count, u32 type)
@@ -263,18 +270,43 @@
MOD_DEC_USE_COUNT;
return NULL;
}
- for (i = 0; i < page_count; i++) {
- new->memory[i] = agp_bridge.agp_alloc_page();
- if (new->memory[i] == 0) {
- /* Free this structure */
- agp_free_memory(new);
+ if (agp_bridge.cant_use_aperture) {
+ void *vmblock;
+ unsigned long vaddr;
+ struct page *page;
+
+ vmblock = __vmalloc(page_count << PAGE_SHIFT, GFP_KERNEL, PAGE_KERNEL);
+ if (vmblock == NULL) {
+ MOD_DEC_USE_COUNT;
return NULL;
}
- new->memory[i] = virt_to_phys((void *) new->memory[i]);
- new->page_count++;
- }
+ new->vmptr = vmblock;
+ vaddr = (unsigned long) vmblock;
+
+ for (i = 0; i < page_count; i++, vaddr += PAGE_SIZE) {
+ page = vmalloc_to_page((void *) vaddr);
+ if (!page) {
+ MOD_DEC_USE_COUNT;
+ return NULL;
+ }
+ new->memory[i] = virt_to_phys(page_address(page));
+ }
+ new->page_count = page_count;
+ } else {
+ for (i = 0; i < page_count; i++) {
+ new->memory[i] = agp_bridge.agp_alloc_page();
+
+ if (new->memory[i] == 0) {
+ /* Free this structure */
+ agp_free_memory(new);
+ return NULL;
+ }
+ new->memory[i] = virt_to_phys((void *) new->memory[i]);
+ new->page_count++;
+ }
+ }
return new;
}
@@ -287,26 +319,18 @@
temp = agp_bridge.current_size;
- switch (agp_bridge.size_type) {
- case U8_APER_SIZE:
+ if (agp_bridge.size_type == U8_APER_SIZE)
current_size = A_SIZE_8(temp)->size;
- break;
- case U16_APER_SIZE:
+ else if (agp_bridge.size_type == U16_APER_SIZE)
current_size = A_SIZE_16(temp)->size;
- break;
- case U32_APER_SIZE:
+ else if (agp_bridge.size_type == U32_APER_SIZE)
current_size = A_SIZE_32(temp)->size;
- break;
- case LVL2_APER_SIZE:
+ else if (agp_bridge.size_type == LVL2_APER_SIZE)
current_size = A_SIZE_LVL2(temp)->size;
- break;
- case FIXED_APER_SIZE:
+ else if (agp_bridge.size_type == FIXED_APER_SIZE)
current_size = A_SIZE_FIX(temp)->size;
- break;
- default:
+ else
current_size = 0;
- break;
- }
current_size -= (agp_memory_reserved / (1024*1024));
@@ -315,6 +339,9 @@
/* Routine to copy over information structure */
+/* AGP bridge need not be PCI device, but DRM thinks it is. */
+static struct pci_dev fake_bridge_dev;
+
int agp_copy_info(agp_kern_info * info)
{
memset(info, 0, sizeof(agp_kern_info));
@@ -324,7 +351,7 @@
}
info->version.major = agp_bridge.version->major;
info->version.minor = agp_bridge.version->minor;
- info->device = agp_bridge.dev;
+ info->device = agp_bridge.dev ? agp_bridge.dev : &fake_bridge_dev;
info->chipset = agp_bridge.type;
info->mode = agp_bridge.mode;
info->aper_base = agp_bridge.gart_bus_addr;
@@ -398,97 +425,104 @@
/* Generic Agp routines - Start */
-static void agp_generic_agp_enable(u32 mode)
+static u32 agp_collect_device_status(u32 mode, u32 command)
{
- struct pci_dev *device = NULL;
- u32 command, scratch;
- u8 cap_ptr;
+ struct pci_dev *device;
+ u8 agp;
+ u32 scratch;
- pci_read_config_dword(agp_bridge.dev,
- agp_bridge.capndx + 4,
- &command);
+ pci_for_each_dev(device) {
+ agp = pci_find_capability(device, PCI_CAP_ID_AGP);
+ if (!agp)
+ continue;
- /*
- * PASS1: go throu all devices that claim to be
- * AGP devices and collect their data.
- */
+ /*
+ * Ok, here we have a AGP device. Disable impossible
+ * settings, and adjust the readqueue to the minimum.
+ */
+ pci_read_config_dword(device, agp + PCI_AGP_STATUS, &scratch);
+ /* adjust RQ depth */
+ command =
+ ((command & ~0xff000000) |
+ min_t(u32, (mode & 0xff000000),
+ min_t(u32, (command & 0xff000000),
+ (scratch & 0xff000000))));
+
+ /* disable SBA if it's not supported */
+ if (!((command & 0x00000200) &&
+ (scratch & 0x00000200) &&
+ (mode & 0x00000200)))
+ command &= ~0x00000200;
+
+ /* disable FW if it's not supported */
+ if (!((command & 0x00000010) &&
+ (scratch & 0x00000010) &&
+ (mode & 0x00000010)))
+ command &= ~0x00000010;
- pci_for_each_dev(device) {
- cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
- if (cap_ptr != 0x00) {
- /*
- * Ok, here we have a AGP device. Disable impossible
- * settings, and adjust the readqueue to the minimum.
- */
-
- pci_read_config_dword(device, cap_ptr + 4, &scratch);
-
- /* adjust RQ depth */
- command =
- ((command & ~0xff000000) |
- min_t(u32, (mode & 0xff000000),
- min_t(u32, (command & 0xff000000),
- (scratch & 0xff000000))));
-
- /* disable SBA if it's not supported */
- if (!((command & 0x00000200) &&
- (scratch & 0x00000200) &&
- (mode & 0x00000200)))
- command &= ~0x00000200;
-
- /* disable FW if it's not supported */
- if (!((command & 0x00000010) &&
- (scratch & 0x00000010) &&
- (mode & 0x00000010)))
- command &= ~0x00000010;
-
- if (!((command & 4) &&
- (scratch & 4) &&
- (mode & 4)))
- command &= ~0x00000004;
-
- if (!((command & 2) &&
- (scratch & 2) &&
- (mode & 2)))
- command &= ~0x00000002;
-
- if (!((command & 1) &&
- (scratch & 1) &&
- (mode & 1)))
- command &= ~0x00000001;
- }
+ if (!((command & 4) &&
+ (scratch & 4) &&
+ (mode & 4)))
+ command &= ~0x00000004;
+
+ if (!((command & 2) &&
+ (scratch & 2) &&
+ (mode & 2)))
+ command &= ~0x00000002;
+
+ if (!((command & 1) &&
+ (scratch & 1) &&
+ (mode & 1)))
+ command &= ~0x00000001;
}
- /*
- * PASS2: Figure out the 4X/2X/1X setting and enable the
- * target (our motherboard chipset).
- */
- if (command & 4) {
+ if (command & 4)
command &= ~3; /* 4X */
+ if (command & 2)
+ command &= ~5; /* 2X (8X for AGP3.0) */
+ if (command & 1)
+ command &= ~6; /* 1X (4X for AGP3.0) */
+
+ return command;
+}
+
+static void agp_device_command(u32 command, int agp_v3)
+{
+ struct pci_dev *device;
+ int mode;
+
+ mode = command & 0x7;
+ if (agp_v3)
+ mode *= 4;
+
+ pci_for_each_dev(device) {
+ u8 agp = pci_find_capability(device, PCI_CAP_ID_AGP);
+ if (!agp)
+ continue;
+
+ printk(KERN_INFO PFX "Putting AGP V%d device at %s into %dx mode\n",
+ agp_v3 ? 3 : 2, device->slot_name, mode);
+ pci_write_config_dword(device, agp + PCI_AGP_COMMAND, command);
}
- if (command & 2) {
- command &= ~5; /* 2X */
- }
- if (command & 1) {
- command &= ~6; /* 1X */
- }
+}
+
+static void agp_generic_agp_enable(u32 mode)
+{
+ u32 command;
+
+ pci_read_config_dword(agp_bridge.dev,
+ agp_bridge.capndx + PCI_AGP_STATUS,
+ &command);
+
+ command = agp_collect_device_status(mode, command);
command |= 0x00000100;
pci_write_config_dword(agp_bridge.dev,
- agp_bridge.capndx + 8,
+ agp_bridge.capndx + PCI_AGP_COMMAND,
command);
- /*
- * PASS3: Go throu all AGP devices and update the
- * command registers.
- */
-
- pci_for_each_dev(device) {
- cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
- if (cap_ptr != 0x00)
- pci_write_config_dword(device, cap_ptr + 8, command);
- }
+ agp_device_command(command, 0);
}
static int agp_generic_create_gatt_table(void)
@@ -3641,7 +3675,6 @@
struct pci_dev *device = NULL;
u32 command, scratch;
u8 cap_ptr;
- u8 agp_v3;
u8 v3_devs=0;
/* FIXME: If 'mode' is x1/x2/x4 should we call the AGPv2 routines directly ?
@@ -3674,77 +3707,14 @@
}
- pci_read_config_dword(agp_bridge.dev, agp_bridge.capndx + 4, &command);
-
- /*
- * PASS2: go through all devices that claim to be
- * AGP devices and collect their data.
- */
-
- pci_for_each_dev(device) {
- cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
- if (cap_ptr != 0x00) {
- /*
- * Ok, here we have a AGP device. Disable impossible
- * settings, and adjust the readqueue to the minimum.
- */
-
- printk (KERN_INFO "AGP: Setting up AGPv3 capable device at %d:%d:%d\n",
- device->bus->number, PCI_FUNC(device->devfn), PCI_SLOT(device->devfn));
- pci_read_config_dword(device, cap_ptr + 4, &scratch);
- agp_v3 = (scratch & (1<<3) ) >>3;
-
- /* adjust RQ depth */
- command =
- ((command & ~0xff000000) |
- min_t(u32, (mode & 0xff000000),
- min_t(u32, (command & 0xff000000),
- (scratch & 0xff000000))));
-
- /* disable SBA if it's not supported */
- if (!((command & 0x200) && (scratch & 0x200) && (mode & 0x200)))
- command &= ~0x200;
-
- /* disable FW if it's not supported */
- if (!((command & 0x10) && (scratch & 0x10) && (mode & 0x10)))
- command &= ~0x10;
-
- if (!((command & 2) && (scratch & 2) && (mode & 2))) {
- command &= ~2; /* 8x */
- printk (KERN_INFO "AGP: Putting device into 8x mode\n");
- }
-
- if (!((command & 1) && (scratch & 1) && (mode & 1))) {
- command &= ~1; /* 4x */
- printk (KERN_INFO "AGP: Putting device into 4x mode\n");
- }
- }
- }
- /*
- * PASS3: Figure out the 8X/4X setting and enable the
- * target (our motherboard chipset).
- */
-
- if (command & 2)
- command &= ~5; /* 8X */
-
- if (command & 1)
- command &= ~6; /* 4X */
+ pci_read_config_dword(agp_bridge.dev, agp_bridge.capndx + PCI_AGP_STATUS, &command);
+ command = agp_collect_device_status(mode, command);
command |= 0x100;
- pci_write_config_dword(agp_bridge.dev, agp_bridge.capndx + 8, command);
+ pci_write_config_dword(agp_bridge.dev, agp_bridge.capndx + PCI_AGP_COMMAND, command);
- /*
- * PASS4: Go through all AGP devices and update the
- * command registers.
- */
-
- pci_for_each_dev(device) {
- cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
- if (cap_ptr != 0x00)
- pci_write_config_dword(device, cap_ptr + 8, command);
- }
+ agp_device_command(command, 1);
}
@@ -4457,7 +4427,7 @@
/* Fill in the mode register */
pci_read_config_dword(serverworks_private.svrwrks_dev,
- agp_bridge.capndx + 4,
+ agp_bridge.capndx + PCI_AGP_STATUS,
&agp_bridge.mode);
pci_read_config_byte(agp_bridge.dev,
@@ -4607,104 +4577,23 @@
static void serverworks_agp_enable(u32 mode)
{
- struct pci_dev *device = NULL;
- u32 command, scratch, cap_id;
- u8 cap_ptr;
+ u32 command;
pci_read_config_dword(serverworks_private.svrwrks_dev,
- agp_bridge.capndx + 4,
+ agp_bridge.capndx + PCI_AGP_STATUS,
&command);
- /*
- * PASS1: go throu all devices that claim to be
- * AGP devices and collect their data.
- */
-
-
- pci_for_each_dev(device) {
- cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
- if (cap_ptr != 0x00) {
- do {
- pci_read_config_dword(device,
- cap_ptr, &cap_id);
-
- if ((cap_id & 0xff) != 0x02)
- cap_ptr = (cap_id >> 8) & 0xff;
- }
- while (((cap_id & 0xff) != 0x02) && (cap_ptr != 0x00));
- }
- if (cap_ptr != 0x00) {
- /*
- * Ok, here we have a AGP device. Disable impossible
- * settings, and adjust the readqueue to the minimum.
- */
-
- pci_read_config_dword(device, cap_ptr + 4, &scratch);
-
- /* adjust RQ depth */
- command =
- ((command & ~0xff000000) |
- min_t(u32, (mode & 0xff000000),
- min_t(u32, (command & 0xff000000),
- (scratch & 0xff000000))));
-
- /* disable SBA if it's not supported */
- if (!((command & 0x00000200) &&
- (scratch & 0x00000200) &&
- (mode & 0x00000200)))
- command &= ~0x00000200;
-
- /* disable FW */
- command &= ~0x00000010;
-
- command &= ~0x00000008;
-
- if (!((command & 4) &&
- (scratch & 4) &&
- (mode & 4)))
- command &= ~0x00000004;
-
- if (!((command & 2) &&
- (scratch & 2) &&
- (mode & 2)))
- command &= ~0x00000002;
-
- if (!((command & 1) &&
- (scratch & 1) &&
- (mode & 1)))
- command &= ~0x00000001;
- }
- }
- /*
- * PASS2: Figure out the 4X/2X/1X setting and enable the
- * target (our motherboard chipset).
- */
+ command = agp_collect_device_status(mode, command);
- if (command & 4) {
- command &= ~3; /* 4X */
- }
- if (command & 2) {
- command &= ~5; /* 2X */
- }
- if (command & 1) {
- command &= ~6; /* 1X */
- }
+ command &= ~0x00000010; /* disable FW */
+ command &= ~0x00000008;
command |= 0x00000100;
pci_write_config_dword(serverworks_private.svrwrks_dev,
- agp_bridge.capndx + 8,
+ agp_bridge.capndx + PCI_AGP_COMMAND,
command);
- /*
- * PASS3: Go throu all AGP devices and update the
- * command registers.
- */
-
- pci_for_each_dev(device) {
- cap_ptr = pci_find_capability(device, PCI_CAP_ID_AGP);
- if (cap_ptr != 0x00)
- pci_write_config_dword(device, cap_ptr + 8, command);
- }
+ agp_device_command(command, 0);
}
static int __init serverworks_setup (struct pci_dev *pdev)
@@ -6469,7 +6358,6 @@
"IGP9100/M",
ati_generic_setup },
#endif /* CONFIG_AGP_ATI */
-
{ 0, }, /* dummy final entry, always present */
};
@@ -6552,7 +6440,6 @@
return -ENODEV;
}
-
/* Supported Device Scanning routine */
static int __init agp_find_supported_device(void)
@@ -6880,7 +6767,7 @@
/* Fill in the mode register */
pci_read_config_dword(agp_bridge.dev,
- agp_bridge.capndx + 4,
+ agp_bridge.capndx + PCI_AGP_STATUS,
&agp_bridge.mode);
/* probe for known chipsets */
@@ -7098,7 +6985,8 @@
inter_module_register("drm_agp", THIS_MODULE, &drm_agp);
- pm_register(PM_PCI_DEV, PM_PCI_ID(agp_bridge.dev), agp_power);
+ if (agp_bridge.dev)
+ pm_register(PM_PCI_DEV, PM_PCI_ID(agp_bridge.dev), agp_power);
return 0;
}
diff -Nru a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
--- a/drivers/scsi/megaraid.c Thu Jan 8 16:33:50 2004
+++ b/drivers/scsi/megaraid.c Thu Jan 8 16:33:50 2004
@@ -2234,9 +2234,6 @@
#if DEBUG
-static unsigned int cum_time = 0;
-static unsigned int cum_time_cnt = 0;
-
static void showMbox (mega_scb * pScb)
{
mega_mailbox *mbox;
@@ -2245,7 +2242,7 @@
return;
mbox = (mega_mailbox *) pScb->mboxData;
- printk ("%u cmd:%x id:%x #scts:%x lba:%x addr:%x logdrv:%x #sg:%x\n",
+ printk ("%lu cmd:%x id:%x #scts:%x lba:%x addr:%x logdrv:%x #sg:%x\n",
pScb->SCpnt->pid,
mbox->cmd, mbox->cmdid, mbox->numsectors,
mbox->lba, mbox->xferaddr, mbox->logdrv, mbox->numsgelements);
@@ -3569,9 +3566,13 @@
mbox[0] = IS_BIOS_ENABLED;
mbox[2] = GET_BIOS;
- mboxpnt->xferaddr = virt_to_bus ((void *) megacfg->mega_buffer);
+ mboxpnt->xferaddr = pci_map_single(megacfg->dev,
+ (void *) megacfg->mega_buffer, (2 * 1024L),
+ PCI_DMA_FROMDEVICE);
ret = megaIssueCmd (megacfg, mbox, NULL, 0);
+
+ pci_unmap_single(megacfg->dev, mboxpnt->xferaddr, 2 * 1024L, PCI_DMA_FROMDEVICE);
return (*(char *) megacfg->mega_buffer);
}
diff -Nru a/fs/inode.c b/fs/inode.c
--- a/fs/inode.c Thu Jan 8 16:33:51 2004
+++ b/fs/inode.c Thu Jan 8 16:33:51 2004
@@ -56,7 +56,7 @@
*/
static LIST_HEAD(inode_in_use);
-static LIST_HEAD(inode_unused);
+LIST_HEAD(inode_unused);
static struct list_head *inode_hashtable;
static LIST_HEAD(anon_hash_chain); /* for inodes with NULL i_sb */
diff -Nru a/kernel/signal.c b/kernel/signal.c
--- a/kernel/signal.c Thu Jan 8 16:33:50 2004
+++ b/kernel/signal.c Thu Jan 8 16:33:50 2004
@@ -1171,8 +1171,19 @@
ss_sp = NULL;
} else {
error = -ENOMEM;
+#ifdef __ia64__
+ /*
+ * XXX fix me: due to an oversight, MINSIGSTKSZ used to be defined
+ * as 2KB, which is far too small. This was after Linux kernel
+ * 2.4.9 but since there are a fair number of ia64 apps out there,
+ * we continue to allow "too" small sigaltstacks for a while.
+ */
+ if (ss_size < 2048)
+ goto out;
+#else
if (ss_size < MINSIGSTKSZ)
goto out;
+#endif
}
current->sas_ss_sp = (unsigned long) ss_sp;
diff -Nru a/mm/mmap.c b/mm/mmap.c
--- a/mm/mmap.c Thu Jan 8 16:33:51 2004
+++ b/mm/mmap.c Thu Jan 8 16:33:51 2004
@@ -15,6 +15,7 @@
#include <linux/fs.h>
#include <linux/personality.h>
#include <linux/mount.h>
+#include <linux/hugetlb.h>
#include <asm/uaccess.h>
#include <asm/pgalloc.h>
@@ -600,7 +601,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;
@@ -650,10 +654,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;
}
@@ -947,6 +967,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;
@@ -1000,7 +1026,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.
@@ -1160,7 +1189,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);