Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mIWXy-0007TB-Ln for mharc-grub-devel@gnu.org; Tue, 24 Aug 2021 09:32:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIWXx-0007QC-7w for grub-devel@gnu.org; Tue, 24 Aug 2021 09:32:57 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:41970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIWXs-00036F-PH for grub-devel@gnu.org; Tue, 24 Aug 2021 09:32:57 -0400 Received: by mail-pj1-x1033.google.com with SMTP id z24-20020a17090acb1800b0018e87a24300so2378145pjt.0 for ; Tue, 24 Aug 2021 06:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8xsd26Qfm7eCYYaAXCjHOgmLfSa9TlSMb+h1iMwXSzM=; b=BifSg8bH/HShnykaoD2X0lDOK3s6YjMkzkV2veT++HHPaE+CxS0uz17/TSSLRdo+Ah 5Cc9M1B7h3/o0TBRYyF4clyV2G/z3sGn5MGJ7O08FfVlXdd0lIrq/Ju2LOnSeTBdu1+Y gTM6u9/DoALEyjDKCkYnqQcO4POqTLPV3WUSs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8xsd26Qfm7eCYYaAXCjHOgmLfSa9TlSMb+h1iMwXSzM=; b=c65beBooR8ij+nRSr93YAdW/aN8nxL/GylqyqIYx6KYV5RZWq6TrTcpvaSiT55CyND TnGUAfSipBAwDyJmP/v1FsHEN3LiS24q2tIumfvf9Mlg9xKE9dwP10z6wG5D2jfjfQwS XICzYVedLXTy0s+2x9gzmKmK0dJWk6iexs+hiOyNxqG69QWScw1fzcSMjwkrrizM+6um QSMKUQG2VkFhN8yZrmqJNWNBkMHcghlMxT38IRbz/92pAa13GOGql+tGdydfjcgYpTez 3FMx5uctE3RtMNqWSVZ1cG9IRrqq1TPMHi9qSy8Vuz4X7BrPYO3N/UsgBk4tLrXrz5Hg tRvA== X-Gm-Message-State: AOAM530J470Mw+jnJ76mv8TyX+IhFhCJkZ3D2XERMIrn4F4YLcoU5ux5 fmIKV+6kkJKFEHld8cdeEHgnBungsdgPYw== X-Google-Smtp-Source: ABdhPJxwj+joRahY7R1wQx34EEv9IFGXCo+6rX1JzzAICaX95ZlapHpFyTTb+sB5NOIoE2EyAqv9BQ== X-Received: by 2002:a17:90a:af8f:: with SMTP id w15mr4435185pjq.90.1629811971305; Tue, 24 Aug 2021 06:32:51 -0700 (PDT) Received: from localhost ([2001:4479:e200:df00:90ee:2749:b9b1:fb92]) by smtp.gmail.com with ESMTPSA id ml5sm2639943pjb.4.2021.08.24.06.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 06:32:50 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org Cc: Daniel Axtens Subject: [RFC PATCH 1/7] emu: support grub_memalign Date: Tue, 24 Aug 2021 23:32:37 +1000 Message-Id: <20210824133243.3296813-2-dja@axtens.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824133243.3296813-1-dja@axtens.net> References: <20210824133243.3296813-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=dja@axtens.net; helo=mail-pj1-x1033.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2021 13:32:57 -0000 This is trivial to do and simplifies Rust support enormously. Signed-off-by: Daniel Axtens --- grub-core/kern/emu/mm.c | 6 ++++++ include/grub/mm.h | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c index 4d1046a219eb..71dc8d422f3e 100644 --- a/grub-core/kern/emu/mm.c +++ b/grub-core/kern/emu/mm.c @@ -73,3 +73,9 @@ grub_realloc (void *ptr, grub_size_t size) grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); return ret; } + +void * +grub_memalign (grub_size_t align, grub_size_t size) +{ + return aligned_alloc (align, size); +} diff --git a/include/grub/mm.h b/include/grub/mm.h index 9c38dd3ca5d2..4407179a838d 100644 --- a/include/grub/mm.h +++ b/include/grub/mm.h @@ -34,9 +34,7 @@ void *EXPORT_FUNC(grub_malloc) (grub_size_t size); void *EXPORT_FUNC(grub_zalloc) (grub_size_t size); void EXPORT_FUNC(grub_free) (void *ptr); void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size); -#ifndef GRUB_MACHINE_EMU void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size); -#endif void grub_mm_check_real (const char *file, int line); #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__); -- 2.30.2