Incomplete merge causes missing flop members

[gagern]

The commit r19329 merges parts of r19310 into the 6.10 branch. However, this merge is incomplete, as it doesn't touch sched_customize.cpp. Neither does it include the modification to that file from r19038.

Therefore sched_customize.cpp currently refers to functions which aren't part of the corresponding classes, causing errors like this when building from the 6.10.18 source tree:

sched_customize.cpp:111: error: 'struct COPROC_ATI' has no member named 'flops'
sched_customize.cpp:190: error: 'struct COPROC_CUDA' has no member named
'flops_estimate'

This issue was also reported as ​Gentoo bug #292784.

[davea]

the 6.10 branch is for client only. For server, use either trunk or server_stable