1 files changed, 7 insertions, 3 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 5b1543f42290..2d8cb1d1682c 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -149,6 +149,7 @@ static struct {
         unsigned int print_ip_opts;
         u64 fields;
         u64 invalid_fields;
+        u64 user_set_fields;
 } output[OUTPUT_TYPE_MAX] = {
 
         [PERF_TYPE_HARDWARE] = {
@@ -345,7 +346,7 @@ static int perf_evsel__do_check_stype(struct perf_evsel *evsel,
         if (attr->sample_type & sample_type)
                 return 0;
 
-        if (output[type].user_set) {
+        if (output[type].user_set_fields & field) {
                 if (allow_user_set)
                         return 0;
                 evname = perf_evsel__name(evsel);
@@ -2632,10 +2633,13 @@ parse:
                                         pr_warning("\'%s\' not valid for %s events. Ignoring.\n",
                                                    all_output_options[i].str, event_type(j));
                                 } else {
-                                        if (change == REMOVE)
+                                        if (change == REMOVE) {
                                                 output[j].fields &= ~all_output_options[i].field;
-                                        else
+                                                output[j].user_set_fields &= ~all_output_options[i].field;
+                                        } else {
                                                 output[j].fields |= all_output_options[i].field;
+                                                output[j].user_set_fields |= all_output_options[i].field;
+                                        }
                                         output[j].user_set = true;
                                         output[j].wildcard_set = true;
                                 }