Skip to contentSkip to conversation

x86: unify power/cpu_(32|64).c

PATCH In review Sergio Luis 4 participants 5 messages Apr 4, 2009 – Apr 8, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 6/6 x86: unify power/cpu_(32|64).c

x86: unify power/cpu_(32|64).c

This is the last unification step. Here we do remove one of the files and rename the left one as cpu.c, as both are now the same. Also update power/Makefile, telling it to build cpu.o, instead of cpu_(32|64).o

---
 arch/x86/power/Makefile |    2 +-
 arch/x86/power/cpu.c    |  258 +++++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/power/cpu_32.c |  258 -----------------------------------------------
 arch/x86/power/cpu_64.c |  258 -----------------------------------------------
 4 files changed, 259 insertions(+), 517 deletions(-)
 create mode 100644 arch/x86/power/cpu.c
 delete mode 100644 arch/x86/power/cpu_32.c
 delete mode 100644 arch/x86/power/cpu_64.c
arch/x86/power/Makefile +1 -1
index 9ff4d5b..a81a0d4 100644
@@ -1,2 +1,2 @@
-obj-$(CONFIG_PM_SLEEP)		+= cpu_$(BITS).o
+obj-$(CONFIG_PM_SLEEP)		+= cpu.o
 obj-$(CONFIG_HIBERNATION)	+= hibernate_$(BITS).o hibernate_asm_$(BITS).o
arch/x86/power/cpu.c new file +258 -0

258 lines not on this page · raw message

arch/x86/power/cpu_32.c deleted +0 -258

258 lines not on this page · raw message

arch/x86/power/cpu_64.c deleted +0 -258

258 lines not on this page · raw message

Acked-by on v1 6/6
#1 lore raw

Hi!

Quoted 9 lines

x86: unify power/cpu_(32|64).c

This is the last unification step. Here we do remove one of the files and rename the left one as cpu.c, as both are now the same. Also update power/Makefile, telling it to build cpu.o, instead of cpu_(32|64).o

Whole series looks ok to me.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#2 lore raw
Quoted 9 lines · Pavel Machek

Hi!

Quoted 7 lines

x86: unify power/cpu_(32|64).c

This is the last unification step. Here we do remove one of the files and rename the left one as cpu.c, as both are now the same. Also update power/Makefile, telling it to build cpu.o, instead of cpu_(32|64).o

Quoted 7 lines
Quoted 2 lines

Whole series looks ok to me.

However, there's no way it can go in before 2.6.30 final.

I'm reviewing it at the moment.

Thanks,
Rafael

#3 lore raw
Quoted 14 lines · Rafael J. Wysocki
Quoted 13 lines · Pavel Machek

Hi!

Quoted 9 lines

x86: unify power/cpu_(32|64).c

This is the last unification step. Here we do remove one of the files and rename the left one as cpu.c, as both are now the same. Also update power/Makefile, telling it to build cpu.o, instead of cpu_(32|64).o

Quoted 5 lines
Quoted 3 lines

Whole series looks ok to me.

However, there's no way it can go in before 2.6.30 final.

Correct.

Quoted 1 line

I'm reviewing it at the moment.

Feel free to queue these bits up in your tree - it's largely related to your area anyway. That way you can stage it in the most robust way. You have a stable (append-only) Git tree for suspend/resume bits, which propagates into linux-next, correct?

Ingo

#4 lore raw
Quoted 21 lines · Ingo Molnar
Quoted 18 lines · Rafael J. Wysocki
Quoted 16 lines · Pavel Machek

Hi!

Quoted 9 lines

x86: unify power/cpu_(32|64).c

This is the last unification step. Here we do remove one of the files and rename the left one as cpu.c, as both are now the same. Also update power/Makefile, telling it to build cpu.o, instead of cpu_(32|64).o

Whole series looks ok to me.

Quoted 8 lines
Quoted 1 line

However, there's no way it can go in before 2.6.30 final.

Correct.

Quoted 1 line

I'm reviewing it at the moment.

Feel free to queue these bits up in your tree - it's largely related to your area anyway.

I will, thanks.

Quoted 3 lines

That way you can stage it in the most robust way. You have a stable (append-only) Git tree for suspend/resume bits, which propagates into linux-next, correct?

Yes, I do.

Best,
Rafael