Skip to content

Commit

Permalink
[S390] Make user-copy operations run-time configurable.
Browse files Browse the repository at this point in the history
Introduces a struct uaccess_ops which allows setting user-copy
operations at run-time.

Signed-off-by: Gerald Schaefer <geraldsc@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Gerald Schaefer authored and Martin Schwidefsky committed Sep 20, 2006
1 parent 6837a8c commit d02765d
Show file tree
Hide file tree
Showing 8 changed files with 411 additions and 621 deletions.
6 changes: 0 additions & 6 deletions arch/s390/kernel/s390_ksyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ EXPORT_SYMBOL(_oi_bitmap);
EXPORT_SYMBOL(_ni_bitmap);
EXPORT_SYMBOL(_zb_findmap);
EXPORT_SYMBOL(_sb_findmap);
EXPORT_SYMBOL(__copy_from_user_asm);
EXPORT_SYMBOL(__copy_to_user_asm);
EXPORT_SYMBOL(__copy_in_user_asm);
EXPORT_SYMBOL(__clear_user_asm);
EXPORT_SYMBOL(__strncpy_from_user_asm);
EXPORT_SYMBOL(__strnlen_user_asm);
EXPORT_SYMBOL(diag10);

/*
Expand Down
7 changes: 7 additions & 0 deletions arch/s390/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
#include <asm/ptrace.h>
#include <asm/sections.h>

/*
* User copy operations.
*/
struct uaccess_ops uaccess;
EXPORT_SYMBOL_GPL(uaccess);

/*
* Machine setup..
*/
Expand Down Expand Up @@ -641,6 +647,7 @@ setup_arch(char **cmdline_p)

memory_end = memory_size;

memcpy(&uaccess, &uaccess_std, sizeof(uaccess));
parse_early_param();

#ifndef CONFIG_64BIT
Expand Down
3 changes: 1 addition & 2 deletions arch/s390/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@

EXTRA_AFLAGS := -traditional

lib-y += delay.o string.o
lib-y += $(if $(CONFIG_64BIT),uaccess64.o,uaccess.o)
lib-y += delay.o string.o uaccess_std.o
lib-$(CONFIG_SMP) += spinlock.o
211 changes: 0 additions & 211 deletions arch/s390/lib/uaccess.S

This file was deleted.

Loading

0 comments on commit d02765d

Please sign in to comment.