Snap for 10851067 from 525030f42ef3a7251e5ea72068b39a75a82c09d7 to 24Q1-release (db4cbaab) · Commits · e / os / android_system_core

init/builtins.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -475,8 +475,6 @@ static struct {
		{ 0, 0 },
		};

		#define DATA_MNT_POINT "/data"

		/* mount <type> <device> <path> <flags ...> <options> */
		static Result<void> do_mount(const BuiltinArguments& args) {
		const char* options = nullptr;

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#if defined(__slm__)
		/* Values are optimized for Silvermont */
		#define SHARED_CACHE_SIZE (10241024) / Silvermont L2 Cache */
		#define DATA_CACHE_SIZE (241024) / Silvermont L1 Data Cache */
		#else
		/* Values are optimized for Atom */
		#define SHARED_CACHE_SIZE (5121024) / Atom L2 Cache */
		#define DATA_CACHE_SIZE (241024) / Atom L1 Data Cache */
		#endif

		#define SHARED_CACHE_SIZE_HALF (SHARED_CACHE_SIZE / 2)
		#define DATA_CACHE_SIZE_HALF (DATA_CACHE_SIZE / 2)

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		/* Values are optimized for Silvermont */
		#define SHARED_CACHE_SIZE (10241024) / Silvermont L2 Cache */
		#define DATA_CACHE_SIZE (241024) / Silvermont L1 Data Cache */

		#define SHARED_CACHE_SIZE_HALF (SHARED_CACHE_SIZE / 2)
		#define DATA_CACHE_SIZE_HALF (DATA_CACHE_SIZE / 2)

+0 −3

Original line number	Diff line number	Diff line
		@@ -44,9 +44,6 @@
		#include <android-base/strings.h>
		#include <android-base/unique_fd.h>

		/* Will be added to UAPI once upstream change is merged */
		#define F_SEAL_FUTURE_WRITE 0x0010

		/*
		* The minimum vendor API level at and after which it is safe to use memfd.
		* This is to facilitate deprecation of ashmem.

+1 −2