Fix build break when CONFIG_CHECKPOINT=n
PATCH 1/1 Fix build break when CONFIG_CHECKPOINT=n
This was introduced in my sem_undo patch. Oops.
Signed-off-by Dan Smith <danms-r/[email protected]>
--- ipc/sem.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
ipc/sem.c +4 -0
@@ -1478,6 +1478,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) }#endif +#ifdef CONFIG_CHECKPOINT static int __get_semids (struct sem_undo_list *ulp,int *semids,int max) {int count =0 ;
@@ -1786,6 +1787,7 @@ static const struct ckpt_obj_ops ckpt_obj_sem_undo_ops = { .checkpoint = checkpoint_sem_undo, .restore = restore_sem_undo, }; +#endif void __init sem_init (void ) {
@@ -1794,9 +1796,11 @@ void __init sem_init (void)" key semid perms nsems uid gid cuid cgid otime ctime\n" , IPC_SEM_IDS, sysvipc_sem_proc_show); +#ifdef CONFIG_CHECKPOINT /* sem_undo_list uses a short but we write a __s16 */ CKPT_BUILD_BUG_ON_MISMATCH (*CKPT_STRUCT_MEMBER (sem_undo, semadj), __s16);register_checkpoint_obj (&ckpt_obj_sem_undo_ops); +#endif }
Signature · 1 line
1.7.2.2
A message that is not in the archive (sent off-list or not yet received): 1285260484-17134-1-git-send-email-danms-r/[email protected]
Oren Laadan
AppliedApplied to ckpt-v22-dev - thanks.
Oren.
Quoted 39 lines · Dan Smith
This was introduced in my
sem_undopatch. Oops.Signed-off-by Dan Smith <danms-r/[email protected]>--- ipc/sem.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)ipc/sem.c +4
-0@@ -1478,6 +1478,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it) }#endif +#ifdef CONFIG_CHECKPOINT static int __get_semids (struct sem_undo_list *ulp,int *semids,int max) {int count =0 ;@@ -1786,6 +1787,7 @@ static const struct ckpt_obj_ops ckpt_obj_sem_undo_ops = { .checkpoint = checkpoint_sem_undo, .restore = restore_sem_undo, }; +#endif void __init sem_init (void ) {@@ -1794,9 +1796,11 @@ void __init sem_init (void)" key semid perms nsems uid gid cuid cgid otime ctime\n" , IPC_SEM_IDS, sysvipc_sem_proc_show); +#ifdef CONFIG_CHECKPOINT /* sem_undo_list uses a short but we write a __s16 */ CKPT_BUILD_BUG_ON_MISMATCH (*CKPT_STRUCT_MEMBER (sem_undo, semadj), __s16);register_checkpoint_obj (&ckpt_obj_sem_undo_ops); +#endif }