arm/mm/tlb-v7.S: fix "warning: extra tokens at end of #ifdef directive [enabled by default]"
bluetooth: fix conflicting types for smp_conn_security