[PATCH 4/6] staging: android: persistent_ram: Move to fs/pstore/ram_core.c

[Greg Kroah-Hartman]

On Wed, May 16, 2012 at 05:43:38AM -0700, Anton Vorontsov wrote:
> This is a first step for adding ECC support for pstore RAM backend: we
> will use the persistent_ram routines, kindly provided by Google.
> 
> Basically, persistent_ram is a set of helper routines to deal with the
> [optionally] ECC-protected persistent ram regions.
> 
> A bit of Makefile, Kconfig and header files adjustments were needed
> because of the move.
> 
> Signed-off-by: Anton Vorontsov <anton.vorontsov at linaro.org>
> Acked-by: Kees Cook <keescook at chromium.org>
> ---
>  drivers/staging/android/Kconfig          |   10 +-
>  drivers/staging/android/Makefile         |    1 -
>  drivers/staging/android/persistent_ram.c |  532 ------------------------------
>  drivers/staging/android/persistent_ram.h |   82 -----
>  drivers/staging/android/ram_console.c    |    2 +-
>  fs/pstore/Kconfig                        |    7 +-
>  fs/pstore/Makefile                       |    2 +-
>  fs/pstore/ram_core.c                     |  532 ++++++++++++++++++++++++++++++
>  include/linux/pstore_ram.h               |   80 +++++
>  9 files changed, 620 insertions(+), 628 deletions(-)
>  delete mode 100644 drivers/staging/android/persistent_ram.c
>  delete mode 100644 drivers/staging/android/persistent_ram.h
>  create mode 100644 fs/pstore/ram_core.c

After applying this patch, and building things, I get the following
errors:

drivers/built-in.o: In function `ram_console_write':
ram_console.c:(.text+0x1690b9): undefined reference to `persistent_ram_write'
drivers/built-in.o: In function `ram_console_read_old':
ram_console.c:(.text+0x1690f7): undefined reference to `persistent_ram_old_size'
ram_console.c:(.text+0x169103): undefined reference to `persistent_ram_old'
ram_console.c:(.text+0x169136): undefined reference to `persistent_ram_ecc_string'
ram_console.c:(.text+0x169177): undefined reference to `persistent_ram_ecc_string'
drivers/built-in.o: In function `ram_console_probe':
ram_console.c:(.init.text+0xc9ea): undefined reference to `persistent_ram_init_ringbuffer'
drivers/built-in.o: In function `ram_console_late_init':
ram_console.c:(.init.text+0xca6c): undefined reference to `persistent_ram_old_size'
ram_console.c:(.init.text+0xcaa2): undefined reference to `persistent_ram_free_old'
ram_console.c:(.init.text+0xcab4): undefined reference to `persistent_ram_old_size'
ram_console.c:(.init.text+0xcac3): undefined reference to `persistent_ram_ecc_string'
make: *** [.tmp_vmlinux1] Error 1

What went wrong?

I've now applied the first 3 patches in this series to my tree, plus the
2 others from the linux-next tree, so care to just fix up these last
three and resend them?

thanks,

greg k-h