The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c6b156e360fc5b18ee20bae0fc0c4188c3aadea6

commit c6b156e360fc5b18ee20bae0fc0c4188c3aadea6
Author:     Ed Maste <[email protected]>
AuthorDate: 2025-10-28 13:12:05 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2025-10-28 19:01:38 +0000

    pmcstat: Remove no-op -k option
    
    Commit 53d0b9e438bc ("pmc: Provide full path to modules from kernel
    linker") made pmcstat's -k option have no effect, but the option was
    retained for backwards compatibility (while emitting a warning that
    -k is not in FreeBSD 15).
    
    Reviewed by:    jrtc27
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D53397
---
 usr.sbin/pmcstat/pmcstat.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index ac9169f3e008..1809dae7bc4c 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -519,7 +519,7 @@ main(int argc, char **argv)
        CPU_COPY(&rootmask, &cpumask);
 
        while ((option = getopt(argc, argv,
-           "ACD:EF:G:ILM:NO:P:R:S:TUWZa:c:def:gi:k:l:m:n:o:p:qr:s:t:u:vw:z:")) 
!= -1)
+           "ACD:EF:G:ILM:NO:P:R:S:TUWZa:c:def:gi:l:m:n:o:p:qr:s:t:u:vw:z:")) 
!= -1)
                switch (option) {
                case 'A':
                        args.pa_flags |= FLAG_SKIP_TOP_FN_RES;
@@ -607,11 +607,6 @@ main(int argc, char **argv)
                        args.pa_flags |= FLAG_SHOW_OFFSET;
                        break;
 
-               case 'k':       /* pathname to the kernel */
-                       warnx("WARNING: -k is obsolete, has no effect "
-                           "and will be removed in FreeBSD 15.");
-                       break;
-
                case 'L':
                        do_listcounters = 1;
                        break;

Reply via email to