On Wed, 13 May 2015, Toshi Kani wrote: > +int set_memory_wt(unsigned long addr, int numpages) > +{ > + int ret; > + > + if (!pat_enabled) > + return set_memory_uc(addr, numpages); > + > + ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE, > + _PAGE_CACHE_MODE_WT, NULL); > + if (ret) > + goto out_err; > + > + ret = _set_memory_wt(addr, numpages); > + if (ret) > + goto out_free; > + > + return 0; > + > +out_free: > + free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE); > +out_err: > + return ret; This goto zoo is horrible to read. What's wrong with a straight forward: + if (!pat_enabled) + return set_memory_uc(addr, numpages); + + ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE, + _PAGE_CACHE_MODE_WT, NULL); + if (ret) + return ret; + + ret = _set_memory_wt(addr, numpages); + if (ret) + free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE); + return ret; Thanks, tglx -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>