From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH -mm 2/2] Hibernation: Arbitrary boot kernel support on x86_64 Date: Sat, 25 Aug 2007 22:32:42 +0200 Message-ID: <200708252232.43478.rjw@sisk.pl> References: <200708241206.57178.rjw@sisk.pl> <200708241211.55319.rjw@sisk.pl> <20070824162346.ec57f508.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20070824162346.ec57f508.akpm@linux-foundation.org> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: Andrew Morton Cc: pm list , Andi Kleen , LKML List-Id: linux-pm@vger.kernel.org On Saturday, 25 August 2007 01:23, Andrew Morton wrote: > On Fri, 24 Aug 2007 12:11:54 +0200 > "Rafael J. Wysocki" wrote: > > > Index: linux-2.6.23-rc3/include/asm-x86_64/suspend.h > > =================================================================== > > --- linux-2.6.23-rc3.orig/include/asm-x86_64/suspend.h 2007-08-21 20:36:49.000000000 +0200 > > +++ linux-2.6.23-rc3/include/asm-x86_64/suspend.h 2007-08-21 20:37:47.000000000 +0200 > > @@ -43,4 +43,10 @@ extern void fix_processor_context(void); > > /* routines for saving/restoring kernel state */ > > extern int acpi_save_state_mem(void); > > > > +#define ARCH_HAS_HIBERNATION_HEADER > > The preferred way of doing this is via Kconfig, please. ie: add a > CONFIG_HIBERNATION_HEADER to arch/x86_64/Kconfig. OK > > + > > +/* arch/x86_64/kernel/suspend.c */ > > +extern int arch_hibernation_header_save(void *addr, unsigned int max_size); > > +extern int arch_hibernation_header_restore(void *addr); > > Given that these are called from non-arch-specific code, they must have the > same signature across all architectures. So there's no point in putting > the prototypes into an arch-specific header file. > > It would be better to do something like this in (say) suspend.h: > > #ifdef CONFIG_HIBERNATION_HEADER > extern int arch_hibernation_header_save(void *addr, unsigned int max_size); > extern int arch_hibernation_header_restore(void *addr); > #else > static inline int arch_hibernation_header_save(void *addr, > unsigned int max_size) > { > return 0; > } > > static inline int arch_hibernation_header_restore(void *addr) > { > return 0; > } > #endif > > then go nuke some ifdefs from the .c files. The ifdefs in snapshot.c are necessary anyway, because they are around some code that is only compiled when the CONFIG_HIBERNATION_HEADER is undefined. I'll post the reworked patches in a new thread once again after the other issue raised by Pavel gets settled.