fix typo and warning
Merge branch 'master' of http://github.com/kmalloc/server

Conflicts:
	sys/atomic_ops.h
Merge branch 'master' of http://github.com/kmalloc/server

Conflicts:
	sys/atomic_ops.h