The patch titled
revert x86_64-mm-getcpu-vsyscall
has been added to the -mm tree. Its filename is
revert-x86_64-mm-getcpu-vsyscall.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>
Cc: Vojtech Pavlik <vojtech@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/time.c | 6 ++----
arch/x86_64/kernel/vmlinux.lds.S | 7 -------
arch/x86_64/kernel/vsyscall.c | 20 ++------------------
include/asm-x86_64/vsyscall.h | 9 ---------
4 files changed, 4 insertions(+), 38 deletions(-)
diff -puN arch/x86_64/kernel/time.c~revert-x86_64-mm-getcpu-vsyscall arch/x86_64/kernel/time.c
--- 25/arch/x86_64/kernel/time.c~revert-x86_64-mm-getcpu-vsyscall 2006-05-28 18:46:23.511557504 -0700
+++ 25-akpm/arch/x86_64/kernel/time.c 2006-05-28 18:46:23.540553096 -0700
@@ -959,7 +959,7 @@ __cpuinit int unsynchronized_tsc(void)
static void __init time_init_rdtsc(void *info)
{
int p;
- p = smp_processor_id() | (cpu_to_node(smp_processor_id()) << 16);
+ p = smp_processor_id();
write_rdtscp_aux(p);
}
@@ -976,9 +976,7 @@ void time_init_gtod(void)
if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP)) {
printk(KERN_INFO "time.c: Initializing RDTSCP feature.\n");
on_each_cpu(time_init_rdtsc, NULL, 1, 1);
- vgetcpu_mode = VGETCPU_RDTSCP;
- } else
- vgetcpu_mode = VGETCPU_CPUID;
+ }
if (vxtime.hpet_address && notsc) {
timetype = hpet_use_timer ? "HPET" : "PIT/HPET";
diff -puN arch/x86_64/kernel/vmlinux.lds.S~revert-x86_64-mm-getcpu-vsyscall arch/x86_64/kernel/vmlinux.lds.S
--- 25/arch/x86_64/kernel/vmlinux.lds.S~revert-x86_64-mm-getcpu-vsyscall 2006-05-28 18:46:23.520556136 -0700
+++ 25-akpm/arch/x86_64/kernel/vmlinux.lds.S 2006-05-28 18:46:23.540553096 -0700
@@ -100,13 +100,6 @@ SECTIONS
.vxtime : AT(VLOAD(.vxtime)) { *(.vxtime) }
vxtime = VVIRT(.vxtime);
- .vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) { *(.vgetcpu_mode) }
- vgetcpu_mode = VVIRT(.vgetcpu_mode);
-
- . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
- .cpu_to_node : AT(VLOAD(.cpu_to_node)) { *(.cpu_to_node) }
- cpu_to_node = VVIRT(.cpu_to_node);
-
.wall_jiffies : AT(VLOAD(.wall_jiffies)) { *(.wall_jiffies) }
wall_jiffies = VVIRT(.wall_jiffies);
diff -puN arch/x86_64/kernel/vsyscall.c~revert-x86_64-mm-getcpu-vsyscall arch/x86_64/kernel/vsyscall.c
--- 25/arch/x86_64/kernel/vsyscall.c~revert-x86_64-mm-getcpu-vsyscall 2006-05-28 18:46:23.528554920 -0700
+++ 25-akpm/arch/x86_64/kernel/vsyscall.c 2006-05-28 18:46:23.539553248 -0700
@@ -38,8 +38,6 @@
int __sysctl_vsyscall __section_sysctl_vsyscall = 1;
seqlock_t __xtime_lock __section_xtime_lock = SEQLOCK_UNLOCKED;
-int __vgetcpu_mode __section_vgetcpu_mode;
-unsigned char __cpu_to_node[NR_CPUS] __section_cpu_to_node;
#include <asm/unistd.h>
@@ -129,22 +127,9 @@ time_t __vsyscall(1) vtime(time_t *t)
return __xtime.tv_sec;
}
-long __vsyscall(2) vgetcpu(int *cpu, int *node)
+long __vsyscall(2) venosys_0(void)
{
- unsigned int dummy, p;
-
- if (__vgetcpu_mode == VGETCPU_RDTSCP) {
- rdtscp(t1, t2, p);
- } else {
- cpuid(1, &dummy, &p, &dummy, &dummy);
- p >>= 24;
- p |= (__cpu_to_node[p] << 16);
- }
- if (cpu)
- *cpu = p & 0xffff;
- if (node)
- *node = p >> 16;
- return 0;
+ return -ENOSYS;
}
long __vsyscall(3) venosys_1(void)
@@ -229,7 +214,6 @@ static int __init vsyscall_init(void)
VSYSCALL_ADDR(__NR_vgettimeofday)));
BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime));
BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE)));
- BUG_ON((unsigned long) &vgetcpu != VSYSCALL_ADDR(__NR_vgetcpu));
map_vsyscall();
#ifdef CONFIG_SYSCTL
register_sysctl_table(kernel_root_table2, 0);
diff -puN include/asm-x86_64/vsyscall.h~revert-x86_64-mm-getcpu-vsyscall include/asm-x86_64/vsyscall.h
--- 25/include/asm-x86_64/vsyscall.h~revert-x86_64-mm-getcpu-vsyscall 2006-05-28 18:46:23.537553552 -0700
+++ 25-akpm/include/asm-x86_64/vsyscall.h 2006-05-28 18:46:23.539553248 -0700
@@ -6,7 +6,6 @@
enum vsyscall_num {
__NR_vgettimeofday,
__NR_vtime,
- __NR_vgetcpu,
};
#define VSYSCALL_START (-10UL << 20)
@@ -17,8 +16,6 @@ enum vsyscall_num {
#ifdef __KERNEL__
#define __section_vxtime __attribute__ ((unused, __section__ (".vxtime"), aligned(16)))
-#define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
-#define __section_cpu_to_node __attribute__ ((unused, __section__ (".cpu_to_node"), aligned(16)))
#define __section_wall_jiffies __attribute__ ((unused, __section__ (".wall_jiffies"), aligned(16)))
#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
#define __section_sys_tz __attribute__ ((unused, __section__ (".sys_tz"), aligned(16)))
@@ -30,9 +27,6 @@ enum vsyscall_num {
#define VXTIME_HPET 2
#define VXTIME_PMTMR 3
-#define VGETCPU_RDTSCP 1
-#define VGETCPU_CPUID 2
-
struct vxtime_data {
long hpet_address; /* HPET base address */
int last;
@@ -47,8 +41,6 @@ struct vxtime_data {
/* vsyscall space (readonly) */
extern struct vxtime_data __vxtime;
-extern int __vgetcpu_mode;
-extern unsigned char __cpu_to_node[];
extern struct timespec __xtime;
extern volatile unsigned long __jiffies;
extern unsigned long __wall_jiffies;
@@ -57,7 +49,6 @@ extern seqlock_t __xtime_lock;
/* kernel space (writeable) */
extern struct vxtime_data vxtime;
-extern int vgetcpu_mode;
extern unsigned long wall_jiffies;
extern struct timezone sys_tz;
extern int sysctl_vsyscall;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
ext3-resize-fix-double-unlock_super.patch
tpm-more-bios-log-parsing-fixes-tidy.patch
revert-swsusp-add-check-for-suspension-of-x-controlled-devices.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
acpi-atlas-acpi-driver-v2-tidy.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
kauditd_thread-warning-fix.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.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
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-netdev-all.patch
git-netdev-all-fixup.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-net.patch
git-nfs-fixup.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
bogus-disk-geometry-on-large-disks-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
driver-for-apple-cinema-display-tweaks.patch
git-supertrak-fixup.patch
revert-x86_64-mm-getcpu-vsyscall.patch
x86_64-reliable-stack-trace-support-i386-fix.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
fix-update_mmu_cache-in-fremapc-fix.patch
page-migration-simplify-migrate_pages-tweaks.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.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
connector-exports.patch
config_net=n-build-fix.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.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
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
keys-fix-race-between-two-instantiators-of-a-key-tidy.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
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.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
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.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
