1 files changed, 5 insertions, 99 deletions

diff --git a/include/asm-s390/sigp.h b/include/asm-s390/sigp.h
index 5154a34a5..bbf97d5c9 100644
--- a/include/asm-s390/sigp.h
+++ b/include/asm-s390/sigp.h
@@ -41,83 +41,6 @@ typedef enum
 	sigp_store_extended_status_at_address
 } sigp_order_code;
 
-#if 0
-/*
- * these definitions are not used at the moment, but we might need
- * them in future.
- */
-typedef struct
-{
-        __u64   cpu_timer;
-        psw_t   current_psw;
-        __u32   prefix;
-        __u32   access_regs[16];
-        __u64   float_regs[4];
-        __u32   gpr_regs[16];
-        __u32   control_regs[16];
-} sigp_status __attribute__((packed));
-
-typedef struct
-{
-        __u8    unused1[216];
-        __u64   cpu_timer;
-        psw_t   current_psw;
-        __u32   prefix;
-        __u32   access_regs[16];
-        __u64   float_regs[4];
-        __u32   gpr_regs[16];
-        __u32   control_regs[16];
-} sigp_status_512 __attribute__((packed));
-
-typedef struct
-{
-        __u32   extended_save_area_address;
-        __u64   cpu_timer;
-        psw_t   current_psw;
-        __u32   prefix;
-        __u32   access_regs[16];
-        __u64   float_regs[4];
-        __u32   gpr_regs[16];
-        __u32   control_regs[16];
-} sigp_extended_status __attribute__((packed));
-
-typedef struct
-{
-        __u8    unused1[212];
-        __u32   extended_save_area_address;
-        __u64   cpu_timer;
-        psw_t   current_psw;
-        __u32   prefix;
-        __u32   access_regs[16];
-        __u64   float_regs[4];
-        __u32   gpr_regs[16];
-        __u32   control_regs[16];
-} sigp_extended_status_512 __attribute__((packed));
-
-typedef struct
-{
-	__u64   bfp_float_regs[16];
-	__u32   bfp_float_control_reg;
-	__u8    reserved[12];                     
-} sigp_extended_save_area __attribute__ ((packed));
-
-typedef struct
-{
-	unsigned equipment_check:1;
-	unsigned unassigned1:20;
-	unsigned incorrect_state:1;
-	unsigned invalid_parameter:1;
-	unsigned external_call_pending:1;
-	unsigned stopped:1;
-	unsigned operator_intervening:1;
-	unsigned check_stop:1;
-	unsigned unassigned2:1;
-	unsigned inoperative:1;
-	unsigned invalid_order:1;
-	unsigned receiver_check:1;
-} sigp_status_bits __attribute__((packed));
-#endif
-
 typedef __u32 sigp_status_word;
 
 typedef enum
@@ -140,16 +63,15 @@ typedef enum
         ec_restart,
         ec_halt,
         ec_power_off,
+        ec_ptlb,
 	ec_bit_last
 } ec_bit_sig;
 
 /* Signals which come with a parameter area, synchronous */
 typedef enum
 {
-	ec_set_ctl,
-	ec_get_ctl,
-	ec_set_ctl_masked,
-        ec_cmd_last
+        ec_callback_async,
+        ec_callback_sync
 } ec_cmd_sig;
 
 /* state information for synchronous signals */
@@ -166,26 +88,10 @@ typedef struct ec_ext_call
 	ec_cmd_sig cmd;
 	atomic_t status;
 	struct ec_ext_call *next;
-	void *parms;
+        void (*func)(void *info);
+        void *info;
 } ec_ext_call;
 
-/* parameter area for the ec_set_ctl and ec_get_ctl signal */
-typedef struct
-{
-	__u16 start_ctl;
-	__u16 end_ctl;
-	__u32 cregs[16];
-} ec_creg_parms;
-
-/* parameter area for the ec_set_ctl_masked signal */
-typedef struct
-{
-	__u16 start_ctl;
-	__u16 end_ctl;
-	__u32 orvals[16];
-	__u32 andvals[16];
-} ec_creg_mask_parms;
-
 /*
  * Signal processor
  */