solve a reboot problem with the oracle unbreakable kernel
merge upstream changes from master