Re: [PATCH take3 16/20] acpi files switched
On Thu, 2007-03-15 at 02:36 -0400, Len Brown wrote: > On Thursday 15 March 2007 01:13, Steven Rostedt wrote: > > Moved the shared files that were in arch/i386/kernel/acpi to the common > > area. > > When I do a "make cscope" on an i386 or an x86_64 box, > will it find these files in the common area? At the moment, "no". With this quick hack, it will work, and I'm sure someone can come up with a better idea. Currently, the "make cscope" and "make TAGS" only get the files that are physically located in the arch. As I mentioned to Ingo, it took me an hour when I first looked for early_printk. Since it wasn't in the TAGS and my own search scripts were also arch specific. I was working in i386, and early_printk is not. But here's a hack that will let both x86_64 and i386 see the same code in the common area for a "make cscope" or "make TAGS". -- Steve diff --git a/Makefile b/Makefile index 6393738..974c05b 100644 --- a/Makefile +++ b/Makefile @@ -1265,8 +1265,16 @@ endif ifeq ($(ALLSOURCE_ARCHS),) ifeq ($(ARCH),um) +ALLSOURCE_ARCHS := $(ARCH) ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) +else ifeq ($(ARCH),x86_64) +ALLSOURCE_ARCHS := $(ARCH) x86 +ALLINCLUDE_ARCHS := $(ARCH) x86 +else ifeq ($(ARCH),i386) +ALLSOURCE_ARCHS := $(ARCH) x86 +ALLINCLUDE_ARCHS := $(ARCH) x86 else +ALLSOURCE_ARCHS := $(ARCH) ALLINCLUDE_ARCHS := $(ARCH) endif else @@ -1274,8 +1282,6 @@ else ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) endif -ALLSOURCE_ARCHS := $(ARCH) - define find-sources ( find $(__srctree) $(RCS_FIND_IGNORE) \ \( -name include -o -name arch \) -prune -o \ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH take3 16/20] acpi files switched
* Len Brown ([EMAIL PROTECTED]) wrote: > On Thursday 15 March 2007 01:13, Steven Rostedt wrote: > > Moved the shared files that were in arch/i386/kernel/acpi to the common > > area. > > When I do a "make cscope" on an i386 or an x86_64 box, > will it find these files in the common area? The simple equiv of 'make ALLSOURCE_ARCHS="$ARCH x86" cscope' should do it. I'm sure there's a slicker way, but this brute force gives you an idea: --- a/Makefile Mon Mar 12 11:07:45 2007 -0700 +++ b/Makefile Thu Mar 15 00:32:25 2007 -0700 @@ -1266,6 +1266,12 @@ ifeq ($(ALLSOURCE_ARCHS),) ifeq ($(ALLSOURCE_ARCHS),) ifeq ($(ARCH),um) ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) +else ifeq ($(ARCH),i386) +ALLINCLUDE_ARCHS := x86 $(ARCH) +ALLSOURCE_ARCHS := x86 $(ARCH) +else ifeq ($(ARCH),x86_64) +ALLINCLUDE_ARCHS := x86 $(ARCH) +ALLSOURCE_ARCHS := x86 $(ARCH) else ALLINCLUDE_ARCHS := $(ARCH) endif @@ -1274,7 +1280,7 @@ ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) endif -ALLSOURCE_ARCHS := $(ARCH) +ALLSOURCE_ARCHS ?= $(ARCH) define find-sources ( find $(__srctree) $(RCS_FIND_IGNORE) \ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH take3 16/20] acpi files switched
* Len Brown ([EMAIL PROTECTED]) wrote: On Thursday 15 March 2007 01:13, Steven Rostedt wrote: Moved the shared files that were in arch/i386/kernel/acpi to the common area. When I do a make cscope on an i386 or an x86_64 box, will it find these files in the common area? The simple equiv of 'make ALLSOURCE_ARCHS=$ARCH x86 cscope' should do it. I'm sure there's a slicker way, but this brute force gives you an idea: --- a/Makefile Mon Mar 12 11:07:45 2007 -0700 +++ b/Makefile Thu Mar 15 00:32:25 2007 -0700 @@ -1266,6 +1266,12 @@ ifeq ($(ALLSOURCE_ARCHS),) ifeq ($(ALLSOURCE_ARCHS),) ifeq ($(ARCH),um) ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) +else ifeq ($(ARCH),i386) +ALLINCLUDE_ARCHS := x86 $(ARCH) +ALLSOURCE_ARCHS := x86 $(ARCH) +else ifeq ($(ARCH),x86_64) +ALLINCLUDE_ARCHS := x86 $(ARCH) +ALLSOURCE_ARCHS := x86 $(ARCH) else ALLINCLUDE_ARCHS := $(ARCH) endif @@ -1274,7 +1280,7 @@ ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) endif -ALLSOURCE_ARCHS := $(ARCH) +ALLSOURCE_ARCHS ?= $(ARCH) define find-sources ( find $(__srctree) $(RCS_FIND_IGNORE) \ - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH take3 16/20] acpi files switched
On Thu, 2007-03-15 at 02:36 -0400, Len Brown wrote: On Thursday 15 March 2007 01:13, Steven Rostedt wrote: Moved the shared files that were in arch/i386/kernel/acpi to the common area. When I do a make cscope on an i386 or an x86_64 box, will it find these files in the common area? At the moment, no. With this quick hack, it will work, and I'm sure someone can come up with a better idea. Currently, the make cscope and make TAGS only get the files that are physically located in the arch. As I mentioned to Ingo, it took me an hour when I first looked for early_printk. Since it wasn't in the TAGS and my own search scripts were also arch specific. I was working in i386, and early_printk is not. But here's a hack that will let both x86_64 and i386 see the same code in the common area for a make cscope or make TAGS. -- Steve diff --git a/Makefile b/Makefile index 6393738..974c05b 100644 --- a/Makefile +++ b/Makefile @@ -1265,8 +1265,16 @@ endif ifeq ($(ALLSOURCE_ARCHS),) ifeq ($(ARCH),um) +ALLSOURCE_ARCHS := $(ARCH) ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH) +else ifeq ($(ARCH),x86_64) +ALLSOURCE_ARCHS := $(ARCH) x86 +ALLINCLUDE_ARCHS := $(ARCH) x86 +else ifeq ($(ARCH),i386) +ALLSOURCE_ARCHS := $(ARCH) x86 +ALLINCLUDE_ARCHS := $(ARCH) x86 else +ALLSOURCE_ARCHS := $(ARCH) ALLINCLUDE_ARCHS := $(ARCH) endif else @@ -1274,8 +1282,6 @@ else ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS) endif -ALLSOURCE_ARCHS := $(ARCH) - define find-sources ( find $(__srctree) $(RCS_FIND_IGNORE) \ \( -name include -o -name arch \) -prune -o \ - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH take3 16/20] acpi files switched
On Thursday 15 March 2007 01:13, Steven Rostedt wrote: > Moved the shared files that were in arch/i386/kernel/acpi to the common > area. When I do a "make cscope" on an i386 or an x86_64 box, will it find these files in the common area? thanks -Len - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH take3 16/20] acpi files switched
Moved the shared files that were in arch/i386/kernel/acpi to the common area. Note, there still exists files in both archs in acpi. Since there's code there that is unique to the arch. Signed-off-by: Steven Rostedt <[EMAIL PROTECTED]> diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile index 7f7be01..3de22c2 100644 --- a/arch/i386/kernel/acpi/Makefile +++ b/arch/i386/kernel/acpi/Makefile @@ -1,10 +1,5 @@ -obj-$(CONFIG_ACPI) += boot.o ifneq ($(CONFIG_PCI),) obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o endif obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o -ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += cstate.o processor.o -endif - diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index c1a2b58..1167962 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -1,6 +1,7 @@ obj-y += bootflag.o quirks.o i8237.o topology.o alternative.o obj-y += cpu/ +obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_CPUID)+= cpuid.o diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile new file mode 100644 index 000..3aa3d16 --- /dev/null +++ b/arch/x86/kernel/acpi/Makefile @@ -0,0 +1,5 @@ +obj-y += boot.o + +ifneq ($(CONFIG_ACPI_PROCESSOR),) +obj-y += processor.o cstate.o +endif diff --git a/arch/i386/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c similarity index 100% rename from arch/i386/kernel/acpi/boot.c rename to arch/x86/kernel/acpi/boot.c diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c similarity index 100% rename from arch/i386/kernel/acpi/cstate.c rename to arch/x86/kernel/acpi/cstate.c diff --git a/arch/i386/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c similarity index 100% rename from arch/i386/kernel/acpi/processor.c rename to arch/x86/kernel/acpi/processor.c diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 080b996..eb4bc11 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -1,9 +1,2 @@ -obj-y := boot.o -boot-y := ../../../i386/kernel/acpi/boot.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o -ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += processor.o -processor-y:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o -endif - -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH take3 16/20] acpi files switched
Moved the shared files that were in arch/i386/kernel/acpi to the common area. Note, there still exists files in both archs in acpi. Since there's code there that is unique to the arch. Signed-off-by: Steven Rostedt [EMAIL PROTECTED] diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile index 7f7be01..3de22c2 100644 --- a/arch/i386/kernel/acpi/Makefile +++ b/arch/i386/kernel/acpi/Makefile @@ -1,10 +1,5 @@ -obj-$(CONFIG_ACPI) += boot.o ifneq ($(CONFIG_PCI),) obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o endif obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o -ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += cstate.o processor.o -endif - diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index c1a2b58..1167962 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -1,6 +1,7 @@ obj-y += bootflag.o quirks.o i8237.o topology.o alternative.o obj-y += cpu/ +obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_CPUID)+= cpuid.o diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile new file mode 100644 index 000..3aa3d16 --- /dev/null +++ b/arch/x86/kernel/acpi/Makefile @@ -0,0 +1,5 @@ +obj-y += boot.o + +ifneq ($(CONFIG_ACPI_PROCESSOR),) +obj-y += processor.o cstate.o +endif diff --git a/arch/i386/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c similarity index 100% rename from arch/i386/kernel/acpi/boot.c rename to arch/x86/kernel/acpi/boot.c diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c similarity index 100% rename from arch/i386/kernel/acpi/cstate.c rename to arch/x86/kernel/acpi/cstate.c diff --git a/arch/i386/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c similarity index 100% rename from arch/i386/kernel/acpi/processor.c rename to arch/x86/kernel/acpi/processor.c diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 080b996..eb4bc11 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -1,9 +1,2 @@ -obj-y := boot.o -boot-y := ../../../i386/kernel/acpi/boot.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o -ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += processor.o -processor-y:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o -endif - -- - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH take3 16/20] acpi files switched
On Thursday 15 March 2007 01:13, Steven Rostedt wrote: Moved the shared files that were in arch/i386/kernel/acpi to the common area. When I do a make cscope on an i386 or an x86_64 box, will it find these files in the common area? thanks -Len - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
