The entropy production in classical irreversible thermodynamics is expressed as a bilinear form of generalized (driving) forces and conjugated (driven) fluxes, which suffers from the arbitrary decomposition of the forces and the fluxes, and the possible negative entropy production in non-Fourier heat conduction problems (heat waves). This paper presents a general form of the entropy production for heat conduction based on the thermomass model, which is the product of the friction force and the drift velocity of the thermomass divided by the temperature; it holds true for both Fourier and non-Fourier heat conduction. Then a generalization of the entropy production is given for other kinds of linear and nonlinear transport processes. The general expression for entropy production is consistent with that given by extended irreversible thermodynamics, where the system entropy depends not only on the classical variables, but also on the dissipative fluxes, for example, the heat flux in heat conduction problems.