Columns and walls should be designed using Lu, "unsupported length of a column, taken as the clear distance between the faces of members capable of providing lateral support to the column." In short, 4m would be the correct height for your wall.
Apologies if I am assuming too much, but if you...