atom.c: Update from another kernel tuna