r1009 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: debian patches
Sven Luther
luther@haydn.debian.org
Wed, 11 Aug 2004 09:05:15 -0600
Author: luther
Date: 2004-08-11 09:05:02 -0600 (Wed, 11 Aug 2004)
New Revision: 1009
Removed:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/oprofile.diff
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
Log:
Removed oprofile patch also included upstream.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog 2004-08-11 14:19:07 UTC (rev 1008)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog 2004-08-11 15:05:02 UTC (rev 1009)
@@ -1,11 +1,12 @@
kernel-patch-powerpc-2.6.8 (2.6.8-0.1) unstable; urgency=low
* Tentative package for the -rc4 kernel-sources.
- * Removed binutils.diff patch since it was a backport (Sven Luther).
- * Removed uhci.diff, it is superceded by the g4-errata fix now in upstream
+ * Removed binutils and oprofile patches as they are now upstream
(Sven Luther).
+ * Removed uhci.diff, which is not needed anymore since the g4-errata patch
+ fixes those issues in a better way (Sven Luther).
- -- Sven Luther <luther@debian.org> Wed, 11 Aug 2004 16:10:36 +0200
+ -- Sven Luther <luther@debian.org> Wed, 11 Aug 2004 17:00:22 +0200
kernel-patch-powerpc-2.6.7 (2.6.7-5) unstable; urgency=high
Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/oprofile.diff
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/oprofile.diff 2004-08-11 14:19:07 UTC (rev 1008)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/oprofile.diff 2004-08-11 15:05:02 UTC (rev 1009)
@@ -1,141 +0,0 @@
-diff -Nur kernel-source-2.6.6/arch/ppc/Makefile linuxppc-2.5-benh/arch/ppc/Makefile
---- kernel-source-2.6.6/arch/ppc/Makefile 2004-06-16 07:18:57.000000000 +0200
-+++ linuxppc-2.5-benh/arch/ppc/Makefile 2004-06-24 12:43:55.995114195 +0200
-@@ -43,6 +43,7 @@
- drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/
- drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/
- drivers-$(CONFIG_8260) += arch/ppc/8260_io/
-+drivers-$(CONFIG_OPROFILE) += arch/ppc/oprofile/
-
- BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
-
-diff -Nur kernel-source-2.6.6/arch/ppc/Kconfig linuxppc-2.5-benh/arch/ppc/Kconfig
---- kernel-source-2.6.6/arch/ppc/Kconfig 2004-04-05 11:49:23.000000000 +0200
-+++ linuxppc-2.5-benh/arch/ppc/Kconfig 2004-03-29 08:34:26.000000000 +0200
-@@ -1154,6 +1154,7 @@
-
- source "lib/Kconfig"
-
-+source "arch/ppc/oprofile/Kconfig"
-
- menu "Kernel hacking"
-
-diff -Nur kernel-source-2.6.6/arch/ppc/kernel/time.c linuxppc-2.5-benh/arch/ppc/kernel/time.c
---- kernel-source-2.6.5/arch/ppc/kernel/time.c 2004-03-11 03:55:37.000000000 +0100
-+++ linuxppc-2.5-benh/arch/ppc/kernel/time.c 2004-03-04 03:04:26.000000000 +0100
-@@ -56,6 +56,7 @@
- #include <linux/mc146818rtc.h>
- #include <linux/time.h>
- #include <linux/init.h>
-+#include <linux/profile.h>
-
- #include <asm/segment.h>
- #include <asm/io.h>
-@@ -107,17 +108,23 @@
- return delta;
- }
-
--extern unsigned long prof_cpu_mask;
--extern unsigned int * prof_buffer;
--extern unsigned long prof_len;
--extern unsigned long prof_shift;
- extern char _stext;
-
--static inline void ppc_do_profile (unsigned long nip)
-+static inline void ppc_do_profile(struct pt_regs *regs)
- {
-+ unsigned long nip;
-+ extern unsigned long prof_cpu_mask;
-+
-+ profile_hook(regs);
-+
-+ if (user_mode(regs))
-+ return;
-+
- if (!prof_buffer)
- return;
-
-+ nip = instruction_pointer(regs);
-+
- /*
- * Only measure the CPUs specified by /proc/irq/prof_cpu_mask.
- * (default is all CPUs.)
-@@ -156,8 +170,7 @@
-
- while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) < 0) {
- jiffy_stamp += tb_ticks_per_jiffy;
-- if (!user_mode(regs))
-- ppc_do_profile(instruction_pointer(regs));
-+ ppc_do_profile(regs);
- if (smp_processor_id())
- continue;
-
-diff -Nur kernel-source-2.6.6/arch/ppc/oprofile/Kconfig linuxppc-2.5-benh/arch/ppc/oprofile/Kconfig
---- kernel-source-2.6.6/arch/ppc/oprofile/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linuxppc-2.5-benh/arch/ppc/oprofile/Kconfig 2003-12-31 03:50:43.000000000 +0100
-@@ -0,0 +1,23 @@
-+
-+menu "Profiling support"
-+ depends on EXPERIMENTAL
-+
-+config PROFILING
-+ bool "Profiling support (EXPERIMENTAL)"
-+ help
-+ Say Y here to enable the extended profiling support mechanisms used
-+ by profilers such as OProfile.
-+
-+
-+config OPROFILE
-+ tristate "OProfile system profiling (EXPERIMENTAL)"
-+ depends on PROFILING
-+ help
-+ OProfile is a profiling system capable of profiling the
-+ whole system, include the kernel, kernel modules, libraries,
-+ and applications.
-+
-+ If unsure, say N.
-+
-+endmenu
-+
-diff -Nur kernel-source-2.6.6/arch/ppc/oprofile/Makefile linuxppc-2.5-benh/arch/ppc/oprofile/Makefile
---- kernel-source-2.6.6/arch/ppc/oprofile/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linuxppc-2.5-benh/arch/ppc/oprofile/Makefile 2003-12-31 03:50:44.000000000 +0100
-@@ -0,0 +1,9 @@
-+obj-$(CONFIG_OPROFILE) += oprofile.o
-+
-+DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
-+ oprof.o cpu_buffer.o buffer_sync.o \
-+ event_buffer.o oprofile_files.o \
-+ oprofilefs.o oprofile_stats.o \
-+ timer_int.o )
-+
-+oprofile-y := $(DRIVER_OBJS) init.o
-diff -Nur kernel-source-2.6.6/arch/ppc/oprofile/init.c linuxppc-2.5-benh/arch/ppc/oprofile/init.c
---- kernel-source-2.6.6/arch/ppc/oprofile/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linuxppc-2.5-benh/arch/ppc/oprofile/init.c 2003-12-31 03:50:45.000000000 +0100
-@@ -0,0 +1,25 @@
-+/**
-+ * @file init.c
-+ *
-+ * @remark Copyright 2002 OProfile authors
-+ * @remark Read the file COPYING
-+ *
-+ * @author John Levon <levon@movementarian.org>
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/oprofile.h>
-+#include <linux/init.h>
-+#include <linux/errno.h>
-+
-+extern void timer_init(struct oprofile_operations ** ops);
-+
-+int __init oprofile_arch_init(struct oprofile_operations ** ops)
-+{
-+ return -ENODEV;
-+}
-+
-+
-+void oprofile_arch_exit(void)
-+{
-+}