With the locking changes in 2/2, it will need a new exported function
that does the locking around the call to __*. With that, it'd be easier
to just merge this.

I.e. __smp_call_function_map() will be the internal (lockless) version,
and you'll end up adding a nonstatic smp_call_function_map() that does
locking and calls the __* one.

Is that OK with you?

Yup, it's fine.

Cheers,
Ben.