Replace local_save_flags_cli with local_irq_save.  Remove duplicate
cli, sti, save_flags and restore_flags definitions.