The patch titled
move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy
has been added to the -mm tree. Its filename is
move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
- Remove unused set_fixaddr_top()
- Remove nasty ARCH_HAS_FOO stuff around arch_vma_name(), use attribute-weak.
- Move forward declaration of struct vm_area_struct as far up the file as we
can to avoid later dupes.
- Use kmem_cache_zalloc()
- misc coding cleanups.
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/sysenter.c | 10 +++++-----
arch/i386/mm/pgtable.c | 8 +-------
fs/proc/task_mmu.c | 5 +++++
include/asm-i386/fixmap.h | 2 --
include/asm-i386/page.h | 6 ++----
include/linux/mm.h | 7 -------
6 files changed, 13 insertions(+), 25 deletions(-)
diff -puN arch/i386/kernel/sysenter.c~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy arch/i386/kernel/sysenter.c
--- devel/arch/i386/kernel/sysenter.c~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy 2006-05-18 01:48:49.000000000 -0700
+++ devel-akpm/arch/i386/kernel/sysenter.c 2006-05-18 01:48:49.000000000 -0700
@@ -66,8 +66,8 @@ int __init sysenter_setup(void)
return 0;
}
-static struct page*
-syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
+static struct page *syscall_nopage(struct vm_area_struct *vma,
+ unsigned long adr, int *type)
{
struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
get_page(p);
@@ -102,13 +102,12 @@ int arch_setup_additional_pages(struct l
goto up_fail;
}
- vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+ vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
if (!vma) {
ret = -ENOMEM;
goto up_fail;
}
- memset(vma, 0, sizeof(struct vm_area_struct));
vma->vm_start = addr;
vma->vm_end = addr + PAGE_SIZE;
/* MAYWRITE to allow gdb to COW and set breakpoints */
@@ -118,7 +117,8 @@ int arch_setup_additional_pages(struct l
vma->vm_ops = &syscall_vm_ops;
vma->vm_mm = mm;
- if ((ret = insert_vm_struct(mm, vma)))
+ ret = insert_vm_struct(mm, vma);
+ if (ret)
goto free_vma;
current->mm->context.vdso = (void *)addr;
current_thread_info()->sysenter_return = SYSENTER_RETURN_OFFSET + addr;
diff -puN arch/i386/mm/pgtable.c~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy arch/i386/mm/pgtable.c
--- devel/arch/i386/mm/pgtable.c~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy 2006-05-18 01:48:49.000000000 -0700
+++ devel-akpm/arch/i386/mm/pgtable.c 2006-05-18 01:48:49.000000000 -0700
@@ -139,7 +139,7 @@ void set_pmd_pfn(unsigned long vaddr, un
__flush_tlb_one(vaddr);
}
-static int nr_fixmaps = 0;
+static int nr_fixmaps;
unsigned long __FIXADDR_TOP = 0xfffff000;
EXPORT_SYMBOL(__FIXADDR_TOP);
@@ -155,12 +155,6 @@ void __set_fixmap (enum fixed_addresses
nr_fixmaps++;
}
-void set_fixaddr_top(unsigned long top)
-{
- BUG_ON(nr_fixmaps > 0);
- __FIXADDR_TOP = top - PAGE_SIZE;
-}
-
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{
return (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
diff -puN fs/proc/task_mmu.c~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy fs/proc/task_mmu.c
--- devel/fs/proc/task_mmu.c~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy 2006-05-18 01:48:49.000000000 -0700
+++ devel-akpm/fs/proc/task_mmu.c 2006-05-18 01:48:49.000000000 -0700
@@ -118,6 +118,11 @@ struct mem_size_stats
unsigned long private_dirty;
};
+__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma)
+{
+ return NULL;
+}
+
static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss)
{
struct task_struct *task = m->private;
diff -puN include/asm-i386/fixmap.h~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy include/asm-i386/fixmap.h
--- devel/include/asm-i386/fixmap.h~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy 2006-05-18 01:48:49.000000000 -0700
+++ devel-akpm/include/asm-i386/fixmap.h 2006-05-18 01:48:49.000000000 -0700
@@ -94,8 +94,6 @@ enum fixed_addresses {
extern void __set_fixmap (enum fixed_addresses idx,
unsigned long phys, pgprot_t flags);
-extern void set_fixaddr_top(unsigned long top);
-
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
/*
diff -puN include/asm-i386/page.h~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy include/asm-i386/page.h
--- devel/include/asm-i386/page.h~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy 2006-05-18 01:48:49.000000000 -0700
+++ devel-akpm/include/asm-i386/page.h 2006-05-18 01:48:49.000000000 -0700
@@ -12,7 +12,6 @@
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
-
#ifdef CONFIG_X86_USE_3DNOW
#include <asm/mmx.h>
@@ -96,6 +95,8 @@ typedef struct { unsigned long pgprot; }
#ifndef __ASSEMBLY__
+struct vm_area_struct;
+
/*
* This much address space is reserved for vmalloc() and iomap()
* as well as fixmap mappings.
@@ -106,10 +107,7 @@ extern int sysctl_legacy_va_layout;
extern int page_is_ram(unsigned long pagenr);
-#define __HAVE_ARCH_VMA_NAME 1
-struct vm_area_struct;
const char *arch_vma_name(struct vm_area_struct *vma);
-#endif /* __ASSEMBLY__ */
#ifdef __ASSEMBLY__
#define __PAGE_OFFSET CONFIG_PAGE_OFFSET
diff -puN include/linux/mm.h~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy include/linux/mm.h
--- devel/include/linux/mm.h~move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy 2006-05-18 01:48:49.000000000 -0700
+++ devel-akpm/include/linux/mm.h 2006-05-18 01:48:49.000000000 -0700
@@ -1089,13 +1089,6 @@ int in_gate_area_no_task(unsigned long a
#define in_gate_area(task, addr) ({(void)task; in_gate_area_no_task(addr);})
#endif /* __HAVE_ARCH_GATE_AREA */
-#ifndef __HAVE_ARCH_VMA_NAME
-static inline const char *arch_vma_name(struct vm_area_struct *vma)
-{
- return NULL;
-}
-#endif /* __HAVE_ARCH_VMA_NAME */
-
/* /proc/<pid>/oom_adj set to -17 protects from the oom-killer */
#define OOM_DISABLE -17
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
binfmt_flat-dont-check-for-emfile.patch
s3c24xx-hardware-spi-driver-tidy.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
powernow-k8-crash-workaround.patch
gregkh-driver-platform_bus-learns-about-modalias-warning-fix.patch
gregkh-driver-warn-when-statically-allocated-kobjects-are-used-fix.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
w1-warning-fix.patch
git-gfs2.patch
git-ieee1394.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-klibc-build-hacks.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
git-libata-all-fixup.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-watchdog.patch
revert-x86_64-mm-i386-prefer-tsc.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86_64-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-specify-node-id-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-3.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
catch-valid-mem-range-at-onlining-memory-tidy.patch
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
tracking-dirty-pages-in-shared-mappings-v4-fix2.patch
tracking-dirty-pages-in-shared-mappings-v4-fix3.patch
throttle-writers-of-shared-mappings-tidy.patch
acx1xx-wireless-driver.patch
x86-kernel-irq-balancer-fix-tidy.patch
move-vsyscall-page-out-of-fixmap-into-normal-vma-as-per-mmap-tidy.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
mark-address_space_operations-const-fix.patch
mark-address_space_operations-const-fix-2.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2.patch
ufs-right-block-allocation-fixes.patch
sunsu-license-fix.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-driver-for-arm-amba-pl031-rtc-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
pi-futex-futex-code-cleanups-fix.patch
document-futex-pi-design-fix-fix.patch
ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
reiser4.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
