From c1f278eac36d14c8544271d4165284bf9599334c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:12 +0200 Subject: [PATCH] --- yaml --- r: 65495 b: refs/heads/master c: 81656390b8dec51ba7b4713a321b353fb2d3ccb1 h: refs/heads/master i: 65493: bed866c89f0fe26738842831254d4926f76a9d7b 65491: 543b80bd368b2a74c6ac094f3de0f7b193907373 65487: f48be42e5bddff4c4d1022f616246d223c66fb45 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{kprobes.c => kprobes_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{kprobes.c => kprobes_64.c} (100%) diff --git a/[refs] b/[refs] index ce61d372918a..e983f636a66e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd4c1b5baacbc7e4257c00f087abfd3f7aef2dfb +refs/heads/master: 81656390b8dec51ba7b4713a321b353fb2d3ccb1 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index 976ea5e7222b..fd19c73a8da0 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_IOMMU) += pci-gart.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o -obj-$(CONFIG_KPROBES) += kprobes.o +obj-$(CONFIG_KPROBES) += kprobes_64.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_X86_VSMP) += vsmp_64.o obj-$(CONFIG_K8_NB) += k8.o diff --git a/trunk/arch/x86_64/kernel/kprobes.c b/trunk/arch/x86_64/kernel/kprobes_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/kprobes.c rename to trunk/arch/x86_64/kernel/kprobes_64.c