Re: [PATCH 02/22] 2.6.22-rc3 perfmon2 : generic kernel modifications

[Stephen Rothwell <sfr@canb.auug.org.au>]

On Tue, 29 May 2007 06:48:16 -0700 Stephane Eranian <eranian@frankl.hpl.hp.com> wrote:
>
> Only in linux-2.6.22/Documentation: perfmon2.txt

Did part of the patch go missing?

> diff --exclude=.git -urp --exclude-from=/tmp/excl315935 linux-2.6.22.base/Makefile linux-2.6.22/Makefile
> --- linux-2.6.22.base/Makefile	2007-05-29 03:17:15.000000000 -0700
> +++ linux-2.6.22/Makefile	2007-05-29 03:24:14.000000000 -0700
> @@ -553,7 +553,7 @@ export mod_strip_cmd
>
>
>  ifeq ($(KBUILD_EXTMOD),)
> -core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
> +core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ perfmon/

This should go near the end of the patch set so that the kernel will
build at each step (if at all possible).

Seeing as what is missing below, naybe you should reorder the patch set
so that the generic changes are at the end i.e. introduce all the new
files and then wire them into the current ifrastructure.

> diff --exclude=.git -urp --exclude-from=/tmp/excl315935 linux-2.6.22.base/drivers/oprofile/oprofile_files.c linux-2.6.22/drivers/oprofile/oprofile_files.c
> --- linux-2.6.22.base/drivers/oprofile/oprofile_files.c	2007-05-29 03:17:41.000000000 -0700
> +++ linux-2.6.22/drivers/oprofile/oprofile_files.c	2007-05-29 03:24:14.000000000 -0700
> @@ -117,7 +117,17 @@ static ssize_t dump_write(struct file *
>  static const struct file_operations dump_fops = {
>  	.write		= dump_write,
>  };
> -
> +
> +static ssize_t implementation(struct file * file, char __user * buf, size_t count, loff_t * offset)

Break long lines at 80 characters.

> Only in linux-2.6.22/include/linux: perfmon.h
> Only in linux-2.6.22/include/linux: perfmon_dfl_smpl.h
> Only in linux-2.6.22/include/linux: perfmon_fmt.h
> Only in linux-2.6.22/include/linux: perfmon_pmu.h

Missing files?

> diff --exclude=.git -urp --exclude-from=/tmp/excl315935 linux-2.6.22.base/kernel/sched.c linux-2.6.22/kernel/sched.c
> --- linux-2.6.22.base/kernel/sched.c	2007-05-29 03:17:57.000000000 -0700
> +++ linux-2.6.22/kernel/sched.c	2007-05-29 03:24:14.000000000 -0700
> @@ -53,6 +53,7 @@
>  #include <linux/kprobes.h>
>  #include <linux/delayacct.h>
>  #include <linux/reciprocal_div.h>
> +#include <linux/perfmon.h>

So I guess it is missing above.

> Only in linux-2.6.22: perfmon

--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachment: pgpfdVHySPppx.pgp
Description: PGP signature